Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 13 Aug 2013 14:42:47 +0000 (16:42 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 13 Aug 2013 14:42:47 +0000 (16:42 +0200)
commitf1ab05190b0624b8e6fa5d6b960c4ffdc6da37a8
tree78afb2525bbf2539e47a4a02f19943ec5ae49511
parentb5bba6e9c972064c1f134a320c4111e1c958cda0
parent16b0e6f051984c6272943442a0b4b3c0b1668723
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan