From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 2 May 2010 22:17:23 +0000 (+0200)
Subject: Merge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9b0e5d0cacd305f62f2f258f06cebc4d1106c25;p=ipfire-3.x.git

Merge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
---