]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'hotfix/news'
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:09:52 +0000 (23:09 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 21:09:52 +0000 (23:09 +0200)

Trivial merge