From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 25 Jul 2010 12:18:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beff0d6364a42fc11e9d7cf5008b2a5e03942261;p=ipfire-3.x.git

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

beff0d6364a42fc11e9d7cf5008b2a5e03942261