From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 19 Mar 2010 14:24:02 +0000 (+0100)
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=58a60fde7432a8276ec821019d401fa6e0e46dc4;p=ipfire-3.x.git

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

58a60fde7432a8276ec821019d401fa6e0e46dc4