Merge branch 'OpenPLi/master'
authorDima73 <Dima-73@inbox.lv>
Wed, 22 Jul 2015 18:06:53 +0000 (21:06 +0300)
committerDima73 <Dima-73@inbox.lv>
Wed, 22 Jul 2015 18:06:53 +0000 (21:06 +0300)

Trivial merge