]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 11:53:51 +0000 (13:53 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 11:53:51 +0000 (13:53 +0200)

Trivial merge