Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 20 Mar 2014 17:33:28 +0000 (18:33 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 20 Mar 2014 17:33:28 +0000 (18:33 +0100)
commit0bbc8c2d0a8071630df62bf6b953377e9318e09e
treed0fb0b0cd728ada6903a6fc64c5d79002812d9e6
parentdcc65257573225bcb6c97038268397745a5e3e6c
parentf36f56e0cec98052a06bc926d96520623f90b0b3
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab