From: fat <jacobthornton@gmail.com>
Date: Sat, 17 Aug 2013 20:43:58 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0~78^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=728a5e17d667422cdad791e06375e8e9a0f80cc1;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
	dist/css/bootstrap.min.css
---

728a5e17d667422cdad791e06375e8e9a0f80cc1