From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 28 Mar 2010 11:08:25 +0000 (+0200)
Subject: Merge commit 'ms/master'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebecf4942916d7043ba680d91ee7d8abbc4a8664;p=ipfire-3.x.git

Merge commit 'ms/master'
---

ebecf4942916d7043ba680d91ee7d8abbc4a8664