From: trikolon <trikolon@ipfire.org>
Date: Sat, 30 Jan 2010 21:21:22 +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=015d4a75111ed91c10b6be7b9f9b6a85afbfded3;p=ipfire-3.x.git

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

015d4a75111ed91c10b6be7b9f9b6a85afbfded3