]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Tue, 18 Dec 2012 09:14:50 +0000 (10:14 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 18 Dec 2012 09:14:50 +0000 (10:14 +0100)

Trivial merge