Merge branch 'develop' of https://git.khaganat.net/khaganat/khanat-code into develop

This commit is contained in:
deed 2016-12-03 17:57:35 +01:00
commit ce305c7512