Merge branch 'xorg/1.0.2/master'
authorStéphane Jacob <sj@m4x.org>
Tue, 28 Dec 2010 19:31:48 +0000 (20:31 +0100)
committerStéphane Jacob <sj@m4x.org>
Tue, 28 Dec 2010 19:31:48 +0000 (20:31 +0100)
commitf8a1899eceabb9648adb85071fab66d49d549337
tree5770f17142e6bd8054e922764a9f7e8ff8e059e8
parentaa0909f4d3c47cdc98d9eac50602649394c6bbe4
parent691999782d434e5d55380cd2b1f35fc9cf9ada8e
Merge branch 'xorg/1.0.2/master'
classes/userfilter.php
configs/platal.ini
htdocs/javascript/profile.js
modules/admin.php
modules/email.php
modules/profile.php
modules/search.php
templates/admin/index.tpl
templates/include/emails.combobox.tpl