From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Fri, 10 Sep 2010 19:46:18 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4527e3eb7dce9104cffa99fb4c67dce0368a39a2;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

4527e3eb7dce9104cffa99fb4c67dce0368a39a2