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

Trivial merge