From: Ben Schweikert <trikolon@ipfire.org>
Date: Sat, 16 Feb 2013 19:25:05 +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=2ad0c24a00c26a1b3ee84f189a774d0263dc6bd1

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

2ad0c24a00c26a1b3ee84f189a774d0263dc6bd1