Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 17 Jan 2014 15:11:44 +0000 (16:11 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 17 Jan 2014 15:11:44 +0000 (16:11 +0100)
commit1afacfe6585d82ff1f6b8d5c37b00ff977f11d36
tree44c81f34479c15e2ee3b2164d12c122a175fa344
parent31cc945eda5880557485ca4c78f2c23ad991faf4
parent07a479f9f7899e0be3a7694bb9bc8cd2a4b4bb00
Merge branch 'master' of ssh://git.onelab.eu/git/myslice