Merge remote-tracking branch 'amarx/BUG10796' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 10:17:53 +0000 (12:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 10:17:53 +0000 (12:17 +0200)

Trivial merge