Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 13:57:00 +0000 (15:57 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 13:57:00 +0000 (15:57 +0200)
commit3d94ee1c99ec876a9f77c68dac1b2a897b4c3105
tree54f6ca5177dcbbc201de1fa66ea7a2d195755c32
parent878862c35e389f01cc7441cc467071642153df37
parent8ed8451797cc339919ab266626e028cbbb88350a
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan