]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 7 Feb 2014 08:26:45 +0000 (09:26 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 7 Feb 2014 08:26:45 +0000 (09:26 +0100)
commit5556164e872cde24e2ea3291cabe1e0eb9f4a009
tree59cdaf773fbf7a102682fcaf5931973d8f8a4a02
parent25b17e140dc2be0447ad8bb9896e725b28681203
parent0f16bbe1286db0d3667ccd87773ff4be5b7b17e7
Merge branch 'master' into dev