]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authoryomguy <yomguy@parisson.com>
Thu, 4 Apr 2013 13:39:01 +0000 (15:39 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 4 Apr 2013 13:39:01 +0000 (15:39 +0200)

Trivial merge