Commit c7549b195ea3be209a8aa826b0f65085b7fdd95e
authorMichel Pollet <github.com@pollet.net>
Tue, 1 Nov 2016 09:34:43 +0000 (09:34 +0000)
committerGitHub <noreply@github.com>
Tue, 1 Nov 2016 09:34:43 +0000 (09:34 +0000)
Timer fix


Trivial merge