From: trikolon <trikolon@ipfire.org>
Date: Sun, 31 Jan 2010 12:15:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26064608eead6cac3a6d1d76e8a683d1b2e32442;p=ipfire-3.x.git

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

26064608eead6cac3a6d1d76e8a683d1b2e32442