From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 May 2010 23:53:02 +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=cd5986c617bec1a7f5abe968e49491f0fa6e2b38;p=ipfire-3.x.git

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

cd5986c617bec1a7f5abe968e49491f0fa6e2b38