From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 5 Feb 2014 12:38:25 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=2cce1559f2da9b986a4288159478b1b999710457

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

2cce1559f2da9b986a4288159478b1b999710457