From: Tom Pietschker <tom.pietschker@acmetechnologygroup.com>
Date: Mon, 8 Apr 2013 12:39:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~460^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7502%2Fhead;p=thirdparty%2Fbootstrap.git

Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
---

bd789ed158f4f8a5f4f9bab137e65d1b8cb29a28