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)
commite93255ef54304c697ef7ac101247f23dc5f7b31f
tree15709328064f3c5e516c099c10319411861e94ee
parentfe6080a465a267e7b5542c8f4f23d13c483df642
parent2d7ad7207e52b478c20f8867121a940665a6f77c
Merge branch 'xorg/maint' into xorg/master
modules/profile.php