From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 15 Jun 2011 14:35:57 +0000 (+0200)
Subject: Merge branch 'pakfire3'
X-Git-Tag: v2.9-core50~4^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=957578a20feaa8f085acd38358f5e74348aa711b;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'pakfire3'
---

957578a20feaa8f085acd38358f5e74348aa711b