From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 Dec 2010 14:32:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~23^2~16^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=20c2b559121a4cc220f68b0ef8846adbe739cb00

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
---

20c2b559121a4cc220f68b0ef8846adbe739cb00