]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Fri, 20 Jul 2012 08:53:07 +0000 (10:53 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 20 Jul 2012 08:53:07 +0000 (10:53 +0200)

Trivial merge