From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Sep 2014 11:03:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/BUG10620' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e09a94a8109be124f1e172999da06e478b15eed;p=people%2Fms%2Fipfire-2.x.git

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

7e09a94a8109be124f1e172999da06e478b15eed