Merge branch 'xorg/1.0.2/master' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Fri, 7 Jan 2011 14:02:04 +0000 (15:02 +0100)
committerStéphane Jacob <sj@m4x.org>
Fri, 7 Jan 2011 14:02:04 +0000 (15:02 +0100)
commitd645ceb701b0e8aa1de2e5271bed35e56ef169f1
tree14478931f9f17d034fd2f00b5b964ae8b049b2f6
parentfc34b3d17fdbc520ddc88f57b9b1eb9dbab0013a
parentb2444825864f6e60bf58dbd6a2cf0b616b53bf4f
Merge branch 'xorg/1.0.2/master' into xorg/master
modules/googleapps.php