Merge branch 'xorg/1.0.2/master' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Fri, 7 Jan 2011 14:05:56 +0000 (15:05 +0100)
committerStéphane Jacob <sj@m4x.org>
Fri, 7 Jan 2011 14:05:56 +0000 (15:05 +0100)
commit5b48ebf46ef939d701852d2117bbcf308036027c
tree4df0608c2069cce5751293fb8e2b19d2c8cee4c3
parentd645ceb701b0e8aa1de2e5271bed35e56ef169f1
parentee1f55352ef94df2e4dcc5599d746fa0d8b5f7b0
Merge branch 'xorg/1.0.2/master' into xorg/master
classes/address.php