From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 12 Jan 2014 22:02:28 +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=9ac43fb9e197e47df7ff9b14d9ba80eca592d9f2

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

9ac43fb9e197e47df7ff9b14d9ba80eca592d9f2