From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Aug 2009 19:38:38 +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=88b4b2aa9473ac679b4f4bf1954271f5be0a9dde;p=ipfire-3.x.git

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

88b4b2aa9473ac679b4f4bf1954271f5be0a9dde