Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 4 Dec 2011 15:04:28 +0000 (16:04 +0100)
committerStéphane Jacob <sj@m4x.org>
Sun, 4 Dec 2011 15:04:28 +0000 (16:04 +0100)
commit8b8d8e64be3a5fe9fe38a5b23c12cd1aa8529bdd
tree84d76fcaf20695e63c5199e876b9fd9df90e11d6
parent40cc32f61aef8bcf8049d59d774f3cb32c0ca276
parent025433d6446c3cb26b7ef924c3a87dec537d1451
Merge branch 'xorg/maint' into xorg/master
modules/xnetgrp.php