]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Thu, 31 May 2012 21:24:58 +0000 (23:24 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 31 May 2012 21:24:58 +0000 (23:24 +0200)

Trivial merge