Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 3 Jul 2013 08:38:15 +0000 (10:38 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 3 Jul 2013 08:38:15 +0000 (10:38 +0200)
commit81969a7eda1f53797b579d0bd6a71e96c26e610b
tree8fd26c2d336c1b6c39a921196ec3924b6f4949b7
parent6e04e60351c5273a38fc7f38d9d2771deb6ee526
parent2f1347ac1031c64b93c0b397add527ef33948974
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan