Merge remote-tracking branch 'amarx/BUG10834' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 14:57:55 +0000 (16:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 14:57:55 +0000 (16:57 +0200)

Trivial merge