From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Sep 2009 20:10: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=f3ac0697463154d59a1973bca75b35b412bdd4e5;p=ipfire-3.x.git

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

f3ac0697463154d59a1973bca75b35b412bdd4e5