Ueland/VikingBot — pull request #29 by hashworks (2014-12-25 15:10:12+00:00)
Title: Merge both config files to avoid missing settings after an upgrade

Resolves #2.