Merge branch 'master' into fusionax
authorPascal Corpet <pascal.corpet@m4x.org>
Mon, 9 Jun 2008 19:56:53 +0000 (21:56 +0200)
committerPascal Corpet <pascal.corpet@m4x.org>
Mon, 9 Jun 2008 19:56:53 +0000 (21:56 +0200)
commitafbcfddcc367de8bdcc6a3075e267745a119fcf4
treeeb6147ac882c32486616ea2f9147b5ce7cac8822
parent652d69e72d90b1c104a6f74061900ca634b898a7
parent0f299eacf7b3df4e469a48347cfae0584ba39d31
Merge branch 'master' into fusionax
htdocs/javascript/profile.js
include/xorg/session.inc.php
modules/profile.php
modules/profile/general.inc.php
templates/profile/general.tpl