From: Mark Otto <otto@github.com>
Date: Fri, 1 Mar 2013 21:53:21 +0000 (-0800)
Subject: Merge branch '3.0.0-wip' into bs3_makefile_separated_done
X-Git-Tag: v3.0.0-rc1~609^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6968%2Fhead;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' into bs3_makefile_separated_done

Conflicts:
	Makefile
---

1f160d4c12e2801d5ede245099d74386f91214a8