Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Wed, 21 Sep 2011 11:33:53 +0000 (13:33 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 21 Sep 2011 11:33:53 +0000 (13:33 +0200)
commit85b2b2257110a8c77d70624f0fa9bba402d99e5f
tree7474c90e536edf997bcf72d4876e78392e533b45
parentb0653ad8f359685deb843d14f3103288997ec0c3
parentb3b00d585c426ee6420cc3f497fb1be869982191
Merge branch 'xorg/maint' into xorg/master
modules/xnetgrp.php