From: Michael Tremer Date: Sun, 12 Dec 2010 21:59:50 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x X-Git-Tag: v2.9-beta2~26 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=b8e2ca20a1fb71b2460a0ef97d462cd55e796b02 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x --- b8e2ca20a1fb71b2460a0ef97d462cd55e796b02