From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 May 2013 14:38:54 +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=c3ab47cd913eb07f1d8f55abf0d93969f02eca37

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

c3ab47cd913eb07f1d8f55abf0d93969f02eca37