From: Mark Otto <otto@github.com>
Date: Thu, 20 Dec 2012 22:02:54 +0000 (-0800)
Subject: Merge branch '3.0.0-wip' into bs3-normalize
X-Git-Tag: v3.0.0-rc1~841
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be74ad7e0d44c30333b08e8200ce128b1ead5b38;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' into bs3-normalize

Conflicts:
	less/bootstrap.less
---

be74ad7e0d44c30333b08e8200ce128b1ead5b38