Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Wed, 29 Jan 2014 15:34:04 +0000 (16:34 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 29 Jan 2014 15:34:04 +0000 (16:34 +0100)

Trivial merge