From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 3 Jul 2013 18:34:15 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-core71~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b25387547d45ee4bb8b81e7aab5db4fb2281ae12;p=ipfire-2.x.git

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

b25387547d45ee4bb8b81e7aab5db4fb2281ae12