]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Thu, 20 Sep 2012 14:33:45 +0000 (16:33 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 20 Sep 2012 14:33:45 +0000 (16:33 +0200)

Trivial merge