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

Merge remote branch 'ms/master'
---

fbd0b63053e2f1521a19663eaa6b7ff166719e88