Merge branch 'xorg/master' into xorg/f/geocoding
authorStéphane Jacob <sj@m4x.org>
Wed, 18 May 2011 13:27:43 +0000 (15:27 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 18 May 2011 13:27:43 +0000 (15:27 +0200)
commite999a40a812f8a2f350d69c5e1611669ff8937d1
tree7877461aceaaa6fd8b0f7df55f97342ae636bc1c
parent9e64234f4b78413b94b0fc2173ea13745a88f986
parentaf6a033a6f6c5a85fb53c22ced514b469daa940a
Merge branch 'xorg/master' into xorg/f/geocoding
classes/direnum.php
classes/userfilter.php
classes/userfilter/conditions.inc.php
modules/payment/money/paypal.inc.php
modules/profile.php