Merge remote-tracking branch 'origin/master'
authorroot <root@devel.pl.sophia.inria.fr>
Fri, 3 Apr 2015 14:57:12 +0000 (16:57 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Fri, 3 Apr 2015 14:57:12 +0000 (16:57 +0200)
commitbc8b4d422e6f0058f405e3f73976fce067ceee4d
tree2e93c0ae95a5052ca0de83b6a78c085c9d5c1b8a
parent20749ef2d179cab28ac1e3b318662f5926b3931e
parent9eedd8fb9d041e0201789c085291d7d674f3a171
Merge remote-tracking branch 'origin/master'