From: Michael Tremer Date: Wed, 20 Jun 2012 13:40:28 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.11-core61^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=953073459e1ab036c21336e7a62b28fc16458bec;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 953073459e1ab036c21336e7a62b28fc16458bec