From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Sep 2014 11:02:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/BUG10615' into next
X-Git-Tag: v2.15-core84~8^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60bce6ba6a70bf6b6683b8125aa86384c9ef5c4e;p=ipfire-2.x.git

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

60bce6ba6a70bf6b6683b8125aa86384c9ef5c4e