]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 31 Jan 2014 16:48:00 +0000 (17:48 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 31 Jan 2014 16:48:00 +0000 (17:48 +0100)
commit15e6bc11c3767bb0b54a89955be939690c9bf403
tree2d3acc7dce497ca8cfae38da2c91f10717787d81
parent177c9dfa4bb9cbc4a7daafc4b47258dec2f6ec24
parent7a888d13504c02892ba446ebdd707bd80efa9836
Merge branch 'dev'