From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 Jun 2013 14:49:30 +0000 (+0200)
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=eb9f4587df23f92e3008abef4e505b4719925697

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

eb9f4587df23f92e3008abef4e505b4719925697