Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 14 Aug 2013 14:45:34 +0000 (16:45 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 14 Aug 2013 14:45:34 +0000 (16:45 +0200)
commit1f92a901985650da63f023930dd069cc671c2c74
tree4fb0c674ef92b3da286d7d4025e2c462072dd320
parent08d7894cc080789686f4b6301626ce54c444d1ff
parent6abb2ca187f04e30071da29386552f3ce670b5dc
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan