From: Schantl Stefan <Stevee@ipfire.org>
Date: Sat, 20 Mar 2010 16:14:36 +0000 (+0100)
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=586b0cb6bab18fa45dc5f9514624013a24189056;p=ipfire-3.x.git

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

586b0cb6bab18fa45dc5f9514624013a24189056