From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Aug 2009 12:02:44 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb4473387b9e1bf8479390ee208c9edf2874fb70;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
---

bb4473387b9e1bf8479390ee208c9edf2874fb70