From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 12 Oct 2013 19:01:13 +0000 (+0200)
Subject: Merge commit '3af3ecd319bdcf8db27e9ca14af72383b4754567' into fifteen
X-Git-Tag: v2.15-beta1~195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b0bc4ca3d5609bed04a34284b5f746616f768f1;p=people%2Fms%2Fipfire-2.x.git

Merge commit '3af3ecd319bdcf8db27e9ca14af72383b4754567' into fifteen
---

5b0bc4ca3d5609bed04a34284b5f746616f768f1