From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 May 2015 14:57:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/BUG10834' into next
X-Git-Tag: v2.17-core91~70
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=9acda8fa69b22f410b2b3787b7fad5cff899488d

Merge remote-tracking branch 'amarx/BUG10834' into next
---

9acda8fa69b22f410b2b3787b7fad5cff899488d