From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Sat, 17 May 2014 16:43:00 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
X-Git-Tag: v2.17-core91~40^2~1^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbd7376b71e7a9affcb41ea7948af66df6ac94f;p=ipfire-2.x.git

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

1fbd7376b71e7a9affcb41ea7948af66df6ac94f