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

Trivial merge