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

Merge remote branch 'ms/master'
---

cfd06ca11d5bd845c45471b5dba492b592fa94b6