From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 Aug 2009 12:14:25 +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=c7e381fcd5ab9f2fe5a95f4a2dedcaf415a4ccb2;p=ipfire-3.x.git

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

c7e381fcd5ab9f2fe5a95f4a2dedcaf415a4ccb2