From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 28 Jan 2010 23:13:12 +0000 (+0100)
Subject: Merge branch 'core36'
X-Git-Tag: v2.9-beta1~483
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8afe69f7464c4a405e91d3fd2f77512d151dba15;p=ipfire-2.x.git

Merge branch 'core36'
---

8afe69f7464c4a405e91d3fd2f77512d151dba15