From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Jul 2013 20:05:12 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-core71^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=920cc7233335608630a117183b24ee0d5ff2a908;p=people%2Fms%2Fipfire-2.x.git

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

920cc7233335608630a117183b24ee0d5ff2a908