Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 24 Oct 2011 22:26:25 +0000 (00:26 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 24 Oct 2011 22:26:25 +0000 (00:26 +0200)
1  2 
modules/profile.php

Simple merge