From: root <root@ipfire.localdomain>
Date: Sun, 5 Apr 2009 09:17:01 +0000 (+0200)
Subject: Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d1955482de4fd0093363b100b72197a5e366b1c1

Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
---

d1955482de4fd0093363b100b72197a5e366b1c1