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

Trivial merge