From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 26 Jul 2010 19:48:35 +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=54ad13e5ddecf893dd7efb52f5b238e41f8d410e;p=ipfire-3.x.git

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

54ad13e5ddecf893dd7efb52f5b238e41f8d410e