From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Jul 2013 16:47:36 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-core72^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cdde6c0bb08508cbbbc9fe430421098e1e1999f;p=people%2Fms%2Fipfire-2.x.git

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

6cdde6c0bb08508cbbbc9fe430421098e1e1999f