From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 11 Apr 2014 13:17:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/RC2-master'
X-Git-Tag: v2.15-rc2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=883aa361b09bf9492781e4ee50dd6eab5a860570;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'amarx/RC2-master'
---

883aa361b09bf9492781e4ee50dd6eab5a860570