From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 9 Jul 2013 18:08:40 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-core71~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65b1608fd2b189cef218a0ebd53f7cde7bc7fe5b;p=ipfire-2.x.git

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

65b1608fd2b189cef218a0ebd53f7cde7bc7fe5b