From: Michael Tremer Date: Sat, 1 Feb 2014 12:38:58 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-beta2~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a20395a645d73a74825693e8d9cbb411a5b3cfcf;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- a20395a645d73a74825693e8d9cbb411a5b3cfcf