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

This should resolve #2 - your decision.