From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Sep 2011 11:36:14 +0000 (+0200)
Subject: Merge branch 'next' into arm-port
X-Git-Tag: v2.9-core54~13^2~57^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0babec1f02fa22ed056e8359dfeebc0e510c29a6;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' into arm-port
---

0babec1f02fa22ed056e8359dfeebc0e510c29a6