]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Mon, 9 Jul 2012 11:42:59 +0000 (13:42 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 9 Jul 2012 11:42:59 +0000 (13:42 +0200)

Trivial merge