From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Sep 2013 14:11:10 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~260^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=303c90a4c16cbc4f1453b4b1a8fa4c47449830a7;p=people%2Fms%2Fipfire-2.x.git

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

303c90a4c16cbc4f1453b4b1a8fa4c47449830a7