From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 24 Apr 2012 09:21:45 +0000 (-0700)
Subject: Merge branch '2.0.3-wip'
X-Git-Tag: v2.0.3~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e659dc7e1be2e09cec34703dce8c737496e3504e;p=thirdparty%2Fbootstrap.git

Merge branch '2.0.3-wip'

Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
---

e659dc7e1be2e09cec34703dce8c737496e3504e
diff --cc Makefile
index ec442c2c42,ea9d3a3f99..827b6920ec
--- a/Makefile
+++ b/Makefile
@@@ -60,4 -91,4 +91,4 @@@ watch
  	watchr -e "watch('less/.*\.less') { system 'make' }"
  
  
--.PHONY: docs watch gh-pages
++.PHONY: docs watch gh-pages