From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Aug 2009 11:05:58 +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=ea1ac2e72cdaf11191f0b67218ca536284abb088;p=ipfire-3.x.git

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

ea1ac2e72cdaf11191f0b67218ca536284abb088