Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan
authorLoic Baron <loic.baron@lip6.fr>
Wed, 21 Aug 2013 13:05:56 +0000 (15:05 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 21 Aug 2013 13:05:56 +0000 (15:05 +0200)
commit4c08a58e3d791fd16c37d579569c73db3378849a
tree65865e689dd987adeac1cd85711923672ffc7207
parent32098db9ef6e2a568a14b40a6b1d1051c65b0389
parentac2dda758798f7e44de062d370763c639cc6a375
Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan