Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 13:57:00 +0000 (15:57 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 13:57:00 +0000 (15:57 +0200)

Trivial merge