Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Fri, 22 Apr 2011 13:12:20 +0000 (15:12 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 22 Apr 2011 13:12:20 +0000 (15:12 +0200)
1  2 
modules/register.php

Simple merge