]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into generic generic
authoryomguy <yomguy@parisson.com>
Mon, 19 Nov 2012 16:02:18 +0000 (17:02 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 19 Nov 2012 16:02:18 +0000 (17:02 +0100)

Trivial merge