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)
1  2 
classes/address.php

Simple merge