]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authoryomguy <yomguy@parisson.com>
Mon, 7 Jan 2013 10:07:41 +0000 (11:07 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 7 Jan 2013 10:07:41 +0000 (11:07 +0100)

Trivial merge