Merge commit 'origin/platal-0.10.2'
authorStéphane Jacob <sj@m4x.org>
Sun, 13 Dec 2009 17:49:06 +0000 (18:49 +0100)
committerStéphane Jacob <sj@m4x.org>
Sun, 13 Dec 2009 17:49:06 +0000 (18:49 +0100)
commit7c7d62fce3e3973b576ffbc4051ba443d6a6b849
tree7136ec70b61eb091c8900ad50f496a721c41e13e
parent891922e07a32ea029a66735689c225a65017d37e
parent1cf7d38b6105c4b5dd7c4f2d84af6615f49151e9
Merge commit 'origin/platal-0.10.2'