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-Tag: v2.13-core69~8^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3ab47cd913eb07f1d8f55abf0d93969f02eca37;p=people%2Fms%2Fipfire-2.x.git

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

c3ab47cd913eb07f1d8f55abf0d93969f02eca37