Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 24 May 2013 08:19:40 +0000 (10:19 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 24 May 2013 08:19:40 +0000 (10:19 +0200)
commitd0ac1170425c64337c521b673b88d75425b8adba
tree2b42cf11135bb95828a392e8f8cf2fffa960aa20
parentc2fe2b106cfe743f9d485c2b4a1e9916a4af7a57
parent014edeca57deed3141dda9056949e537f55fdf25
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan