From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 28 Nov 2010 20:01:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~48^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24f1f6ce6104b1b7afdef9caa7140d704f23d1c8;p=people%2Fstevee%2Fipfire-2.x.git

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

Conflicts:
	config/rootfiles/packages/miniupnpd
---

24f1f6ce6104b1b7afdef9caa7140d704f23d1c8