]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:47:53 +0000 (18:47 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:47:53 +0000 (18:47 +0200)

Trivial merge