From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Tue, 3 Mar 2015 12:45:50 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into pound
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fpound;p=people%2Fglotzi%2Fipfire-2.x.git

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

7a2bb766b7c00dd5d2e87a62ca432a2f5569a91d