From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 27 Apr 2014 18:30:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/updates'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc6440a7291d771f6813f47f1ba3fbda08474776;p=people%2Fms%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/updates'
---

fc6440a7291d771f6813f47f1ba3fbda08474776