Merge pull request #24 from Dima73/master
authorlittlesat <littlesat99@yahoo.com>
Wed, 12 Aug 2015 18:24:56 +0000 (20:24 +0200)
committerlittlesat <littlesat99@yahoo.com>
Wed, 12 Aug 2015 18:24:56 +0000 (20:24 +0200)
Fix conflict timers (step 6)


Trivial merge