From: Matthias Fischer Date: Sat, 9 May 2015 09:09:11 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core92~10^2~2^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=837a6e01a87e8c9fc88920c84718d9d20ae7d859;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 837a6e01a87e8c9fc88920c84718d9d20ae7d859