]> git.parisson.com Git - telemeta.git/commitdiff
merge unstable
authoryomguy <yomguy@parisson.com>
Wed, 8 Jun 2011 12:25:07 +0000 (14:25 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 8 Jun 2011 12:25:07 +0000 (14:25 +0200)

Trivial merge