From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 12 May 2012 17:44:01 +0000 (+0200)
Subject: Merge branch 'master' into core59
X-Git-Tag: v2.11-core61~1
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=619f637be745adc17928e8ec03972f92a1d58a03

Merge branch 'master' into core59
---

619f637be745adc17928e8ec03972f92a1d58a03