]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Dec 2013 22:12:03 +0000 (23:12 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Dec 2013 22:12:03 +0000 (23:12 +0100)
commitadbfc1343fc392c67bcca7c3595df6a700a1c9fb
tree70816b97bd13c8ee9eabb59e7c42efb00f0898fd
parentbea4265bf3acd43fc4303b75a5f97c7709ab72f0
parent0a74560e1092915fd3cde36cf132a475ed10be7a
Merge branch 'dev'