From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Apr 2010 21:45:17 +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=a7924103ddc30437352d75c1c7331c26546b3bfb;p=ipfire-3.x.git

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

a7924103ddc30437352d75c1c7331c26546b3bfb