Merge remote-tracking branch 'stevee/core-90-ddnsctrl' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Apr 2015 09:26:20 +0000 (11:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Apr 2015 09:26:20 +0000 (11:26 +0200)

Trivial merge