From: Jan Paul Tuecking <earl@ipfire.org>
Date: Thu, 16 Jul 2009 15:50:06 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=a3b6782d278f304ed806012036041039c168adef;hp=-c

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

a3b6782d278f304ed806012036041039c168adef