From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 7 May 2010 16:03:26 +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=1003b60d0b5378151b3f4f52687d4ae1f3124ca3;p=ipfire-3.x.git

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

1003b60d0b5378151b3f4f52687d4ae1f3124ca3