]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 09:17:54 +0000 (11:17 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 09:17:54 +0000 (11:17 +0200)

Trivial merge