From: Mark Otto <otto@github.com>
Date: Wed, 15 Jan 2014 05:45:10 +0000 (-0800)
Subject: Merge branch 'master' of github.com:twbs/bootstrap
X-Git-Tag: v3.1.0~103^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b93ce03f19079aaf977125ba27318df0107057eb;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	docs/assets/js/customize.min.js
---

b93ce03f19079aaf977125ba27318df0107057eb