Merge branch 'master' of https://github.com/dopefishh/mc1516pa
authorAlexander Fedotov <soyaxhoya@gmail.com>
Tue, 19 Apr 2016 18:01:45 +0000 (20:01 +0200)
committerAlexander Fedotov <soyaxhoya@gmail.com>
Tue, 19 Apr 2016 18:01:45 +0000 (20:01 +0200)

Trivial merge