Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 14:21:12 +0000 (16:21 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 14:21:12 +0000 (16:21 +0200)
commitcd06fa4f83e017abe561dafcfea0c07b9e1beda3
tree6bf74759496cd0096cfad61b0904eaf3645e6243
parent2e1b7e1f7251fd00077b23fcb5cdff335aa77e24
parent3d94ee1c99ec876a9f77c68dac1b2a897b4c3105
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan