From: Stefan Schantl Date: Sun, 19 Oct 2014 18:11:25 +0000 (+0200) Subject: Merge branch 'guardian-improved' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire... X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2325bd9e48f90a2012d5daf04bd392534520a36e;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'guardian-improved' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire-2.x into guardian-improved --- 2325bd9e48f90a2012d5daf04bd392534520a36e