Merge pull request #19 from Dima73/master
authorlittlesat <littlesat99@yahoo.com>
Sun, 9 Aug 2015 20:56:16 +0000 (22:56 +0200)
committerlittlesat <littlesat99@yahoo.com>
Sun, 9 Aug 2015 20:56:16 +0000 (22:56 +0200)
Fix conflict timers (step 2)


Trivial merge