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

Trivial merge