Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Sun, 13 Oct 2013 19:26:50 +0000 (21:26 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Sun, 13 Oct 2013 19:26:50 +0000 (21:26 +0200)

Trivial merge