Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 24 Nov 2013 15:48:40 +0000 (16:48 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 24 Nov 2013 15:48:40 +0000 (16:48 +0100)
1  2 
modules/xnetgrp.php

Simple merge