Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Mon, 10 Feb 2014 17:29:40 +0000 (18:29 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 10 Feb 2014 17:29:40 +0000 (18:29 +0100)

Trivial merge