From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Sep 2013 08:40:24 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=318685daf4a9d404a98b24f2175e505525547b31

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
---

318685daf4a9d404a98b24f2175e505525547b31