From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 14 Feb 2010 22:49:08 +0000 (+0100)
Subject: Merge remote branch 'ms/master'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e460d6ed71bf41c98222b44d503a50f6a45540d6;p=ipfire-3.x.git

Merge remote branch 'ms/master'
---

e460d6ed71bf41c98222b44d503a50f6a45540d6