From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 24 May 2013 19:54:51 +0000 (+0000)
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^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=034501e6fa3fc3b2d66b1a700e5faa747402d547;p=people%2Fms%2Fipfire-2.x.git

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

034501e6fa3fc3b2d66b1a700e5faa747402d547