Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan
authorLoic Baron <loic.baron@lip6.fr>
Wed, 21 Aug 2013 13:05:56 +0000 (15:05 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 21 Aug 2013 13:05:56 +0000 (15:05 +0200)

Trivial merge