]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 15:23:22 +0000 (17:23 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 15:23:22 +0000 (17:23 +0200)

Trivial merge