Merge remote-tracking branch 'origin/master'
authorroot <root@devel.pl.sophia.inria.fr>
Wed, 6 May 2015 17:48:17 +0000 (19:48 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Wed, 6 May 2015 17:48:17 +0000 (19:48 +0200)
commit415b612c9d4eaa4d28846108b7468ad08fa6be2e
tree2e93c0ae95a5052ca0de83b6a78c085c9d5c1b8a
parentbc8b4d422e6f0058f405e3f73976fce067ceee4d
parent6eb17473d201d1a6036baee01f5d71aea769d6ff
Merge remote-tracking branch 'origin/master'