]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'hotfix/blank' blank
authoryomguy <yomguy@parisson.com>
Tue, 31 Jul 2012 23:28:34 +0000 (01:28 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 31 Jul 2012 23:28:34 +0000 (01:28 +0200)

Trivial merge