]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 11:16:52 +0000 (13:16 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 11:16:52 +0000 (13:16 +0200)

Trivial merge