Merge branch 'master' of https://github.com/dopefishh/mc1516pa
authorAlexander Fedotov <soyaxhoya@gmail.com>
Thu, 21 Apr 2016 15:52:38 +0000 (17:52 +0200)
committerAlexander Fedotov <soyaxhoya@gmail.com>
Thu, 21 Apr 2016 15:52:38 +0000 (17:52 +0200)

Trivial merge