]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Fri, 18 Nov 2011 14:00:49 +0000 (15:00 +0100)
committeryomguy <yomguy@parisson.com>
Fri, 18 Nov 2011 14:00:49 +0000 (15:00 +0100)

Trivial merge