From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 30 Jul 2010 07:42:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55b0487810513ea7e7a8bfbc185e6d91544c01b8;p=ipfire-3.x.git

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

55b0487810513ea7e7a8bfbc185e6d91544c01b8