]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' of /var/git/telemeta
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Apr 2012 13:05:13 +0000 (15:05 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Apr 2012 13:05:13 +0000 (15:05 +0200)

Trivial merge