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

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

9c55a1973db86a66c6cf2d6e337fcffb22b59032