Merge branch 't/gui_reload_fix'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 22 Mar 2015 20:45:11 +0000 (21:45 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 22 Mar 2015 20:45:11 +0000 (21:45 +0100)
commitfb9bb2beb2aea456d99cd93f6badc0b3164b3e29
treefde82d9988047772ccf2b7a4f724fc4e8a0490a4
parent64e24b296546197f0e3c5bb1dc5af8ed16374f08
parent700dc3cf050893acd234a74e617ff2e4b2082f31
Merge branch 't/gui_reload_fix'

Was cooking for two weeks.

* t/gui_reload_fix:
  gui: Fix config file reloading.