Merge branch 'xorg/master' into xorg/f/geocoding
authorStéphane Jacob <sj@m4x.org>
Fri, 13 May 2011 12:31:20 +0000 (14:31 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 13 May 2011 12:31:20 +0000 (14:31 +0200)
commitf3ba9a54052e6841bd0edb15249936a1180adbae
tree0e9c31bd35220f9136f7be053ac3657f6e8d3b49
parentc7d784c58f742f9e5187263bc09765e8993a6875
parent18d4bfef9ab67ed8a83fd04f7b2cbf51ef97b02f
Merge branch 'xorg/master' into xorg/f/geocoding
classes/profile.php
classes/userfilter.php
classes/userfilter/conditions.inc.php
configs/mails.conf
configs/platal.ini
include/ufbuilder.inc.php
modules/profile.php