From: Mark Otto <otto@github.com>
Date: Wed, 6 Feb 2013 03:39:49 +0000 (-0800)
Subject: Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhl... 
X-Git-Tag: v3.0.0~81^2~11^2~1^2~67^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a8d834af61725a61ca7fbc917dd4ae1d36f0769;p=thirdparty%2Fbootstrap.git

Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
---

0a8d834af61725a61ca7fbc917dd4ae1d36f0769