From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Aug 2010 11:09:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d736b109aba44d563cf9fe7844d5f4068a87584;p=people%2Fms%2Fipfire-2.x.git

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

8d736b109aba44d563cf9fe7844d5f4068a87584