Merge remote branch 'origin/xorg/f/geocoding' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Wed, 1 Jun 2011 16:12:40 +0000 (18:12 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 1 Jun 2011 16:12:40 +0000 (18:12 +0200)
commit304cdf32d7c38afbd381909545021fc44c8a0e05
treeb6028442796d44c55937cf0f4a1eed40c1299511
parent37b503e26a679287fe6be80952436f600d5bab9a
parenta3328b1eef7871d9860be82a1d1a65b1572f6880
Merge remote branch 'origin/xorg/f/geocoding' into xorg/master
bin/export_sql.bash
classes/direnum.php
classes/profile.php
classes/userfilter.php
classes/userfilter/conditions.inc.php
htdocs/javascript/profile.js
include/userset.inc.php
include/webservices/manageurs.server.inc.php
modules/profile.php
upgrade/1.1.2/README