From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 16 May 2009 09:40:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f94961ce1b61195df01797bb5b49247d5aab49af;p=ipfire-3.x.git

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

f94961ce1b61195df01797bb5b49247d5aab49af