Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 1 Oct 2011 13:54:02 +0000 (15:54 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 1 Oct 2011 13:54:02 +0000 (15:54 +0200)
1  2 
modules/xnetgrp.php

Simple merge