]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Tue, 27 Mar 2012 15:46:32 +0000 (17:46 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 27 Mar 2012 15:46:32 +0000 (17:46 +0200)

Trivial merge