Code

Merging with changes made by Florian Foster.
authorNicolas JOURDEN <nicolas.jourden@laposte.net>
Fri, 20 Nov 2015 15:44:08 +0000 (16:44 +0100)
committerNicolas JOURDEN <nicolas.jourden@laposte.net>
Fri, 20 Nov 2015 15:44:08 +0000 (16:44 +0100)
commit6ca14739ed8cc76de14bd9ac4d549ba2c7c72a93
treed8ae012fd3dc3c22304df21886e07c129bf3fd76
parentad2caf6750e5e584e39cf6c76a32937e1cef621c
parent621fa8259ea9df412a9b45c3e65ddcf34dd9d9d5
Merging with changes made by Florian Foster.