]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'sabiod' of github.com:yomguy/Telemeta into sabiod
authorThomas Fillon <thomas@parisson.com>
Tue, 21 Jan 2014 14:46:28 +0000 (15:46 +0100)
committerThomas Fillon <thomas@parisson.com>
Tue, 21 Jan 2014 14:46:28 +0000 (15:46 +0100)

Trivial merge