]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 28 May 2014 12:49:47 +0000 (14:49 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 28 May 2014 12:49:47 +0000 (14:49 +0200)
commit05176a2f52dd84e21b0f6df68eb71cd75ac5fa8c
tree9a365a6dcd76c8fffcdc0c6a33fd4bdfd3bf8f28
parent31c11b2a078438ca4329553d704ca131427cb623
parent8f1a69ab7d6dc770e93e0905071e7ac800e4448b
Merge branch 'dev' into crem