From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 8 Jan 2014 14:01:10 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~19^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efca40b5cc923da6fc169d3bb2eaa2f39708330b;p=ipfire-2.x.git

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

efca40b5cc923da6fc169d3bb2eaa2f39708330b