From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 1 Jun 2009 11:30:45 +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=9e95cf583e288d1b5bec77425bad0920b7ec665e;p=ipfire-3.x.git

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

9e95cf583e288d1b5bec77425bad0920b7ec665e