Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 27 Mar 2014 10:50:43 +0000 (11:50 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 27 Mar 2014 10:50:43 +0000 (11:50 +0100)
commit6a832d61d008d5dd1a41df9fe3f63867e31da79e
tree01bcac94fb7bb18a7ea1cee064fcad081774def6
parent086a6b75fb12ddd1feb6d0e75cd9f5d98e4f67f7
parentfd607f7b23cb2e10d97128c5395cbc7dac24eadc
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab