Lokaltog/powerline — pull request #923 by ZyX-I (2014-07-13 19:38:23+00:00)
Title: Implement configuration merging

Ref #418.