From: Matthias Fischer Date: Thu, 21 May 2015 19:18:37 +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~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79f2a76bc303276bf32f103ee081be949a4c69c2;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 79f2a76bc303276bf32f103ee081be949a4c69c2