From: Mark Otto <otto@github.com>
Date: Tue, 26 Mar 2013 19:28:00 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0... 
X-Git-Tag: v3.0.0~81^2~11^2~1^2~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37ba2824bf01ba5db44b64147212763c5064c764;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html
---

37ba2824bf01ba5db44b64147212763c5064c764