Merge pull request #18 from Dima73/master
authorlittlesat <littlesat99@yahoo.com>
Sat, 8 Aug 2015 13:21:56 +0000 (15:21 +0200)
committerlittlesat <littlesat99@yahoo.com>
Sat, 8 Aug 2015 13:21:56 +0000 (15:21 +0200)
Fix conflict timers (step 1)


Trivial merge