Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 24 Feb 2014 11:32:30 +0000 (12:32 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 24 Feb 2014 11:32:30 +0000 (12:32 +0100)
commitac03a689e86f983faa4cf3d77c72b928d6f787dc
tree4b8f9b05e7a1617da218136fd39631b123e50e53
parentb9368f88120ae60d915624bda38af3c3c3ab109a
parentbf1efe0210492077b375de47d0820d454ccb9185
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab