From: Michael Tremer Date: Wed, 29 Apr 2015 09:26:35 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core91~90 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6caea1086d15a0f6d797da31a67d132a298c5d14;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 6caea1086d15a0f6d797da31a67d132a298c5d14