From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 29 Jul 2009 17:23:40 +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=72c0be4ae8b515044dcaac1e05e6a69a8d5402d1;p=ipfire-3.x.git

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

72c0be4ae8b515044dcaac1e05e6a69a8d5402d1