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

Trivial merge