From: Schantl Stefan <Stevee@ipfire.org>
Date: Mon, 10 Aug 2009 18:24:08 +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=1954e982ac626a5a8463adc421e67340a57544e3;p=ipfire-3.x.git

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

1954e982ac626a5a8463adc421e67340a57544e3