From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 7 Sep 2013 12:46:45 +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^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=270c0c0ef03de6b912aeee63d117df6fb64a37e4;p=people%2Fms%2Fipfire-2.x.git

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

270c0c0ef03de6b912aeee63d117df6fb64a37e4