DEADSOFTWARE

Merge branch 'master' of https://repo.or.cz/d2df-sdl
authorJabberwock-RU <jab1@yandex.ru>
Tue, 5 Apr 2016 23:05:41 +0000 (03:05 +0400)
committerJabberwock-RU <jab1@yandex.ru>
Tue, 5 Apr 2016 23:05:41 +0000 (03:05 +0400)

Trivial merge