From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Aug 2009 15:47:09 +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=ced25f5e424b9e7b64155ed8b0034efc5fb0150d;p=ipfire-3.x.git

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

Conflicts:
	src/rootfiles/core/openvpn
---

ced25f5e424b9e7b64155ed8b0034efc5fb0150d