Merge branch 'master' into OpenPLi/master
authorDima73 <Dima-73@inbox.lv>
Tue, 8 Sep 2015 20:30:43 +0000 (23:30 +0300)
committerDima73 <Dima-73@inbox.lv>
Tue, 8 Sep 2015 20:30:43 +0000 (23:30 +0300)
commit857f046679e789bcd0e2f2583d57b5bea4ec4b43
tree0340ab2e500c2e58aa6d998ceb69770f6b1c46cf
parentf4d156b89cd0a88d148342ebc4765cb8ed5ea7ab
parent29af50e9f8cc005be98dc332b9f3fb12234abf9c
Merge branch 'master' into OpenPLi/master