From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 23 Jun 2009 13:28:02 +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=9268e77335b7ed591aadf2e8318d8f2986a204f3;p=ipfire-3.x.git

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

9268e77335b7ed591aadf2e8318d8f2986a204f3