From: Arne Fitzenreiter Date: Sun, 23 Jun 2013 21:14:23 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.13-core70~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3d1635fdddcdf6ac4f199dc041fa06ea7427d49;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- f3d1635fdddcdf6ac4f199dc041fa06ea7427d49