]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:35:11 +0000 (09:35 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:35:11 +0000 (09:35 +0100)

Trivial merge