Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 13:21:19 +0000 (15:21 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 13:21:19 +0000 (15:21 +0200)
commit8ed8451797cc339919ab266626e028cbbb88350a
treef00c43ea2c67d499dff11163245bbdacdc2804ee
parente72274dcda0bdc8ba85eea52f30ac52c373992b5
parentfcc85f6dc021aaf751e739ec1dbdeb4d130b5a20
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan