Merge remote-tracking branch 'amarx/BUG10797' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 09:28:57 +0000 (11:28 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Apr 2015 09:28:57 +0000 (11:28 +0200)

Trivial merge