merge
authorLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 09:39:12 +0000 (11:39 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 09:39:12 +0000 (11:39 +0200)

Trivial merge