From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Aug 2009 19:36:34 +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=090e6c7b030f7f2d606a39697f73fed3e3e8a4b8;p=ipfire-3.x.git

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

090e6c7b030f7f2d606a39697f73fed3e3e8a4b8