From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Jan 2013 14:10:12 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-beta2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cb035bac87b663e871960b90a11b811923d51f9;p=ipfire-2.x.git

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

8cb035bac87b663e871960b90a11b811923d51f9