From: Mark Otto <otto@github.com>
Date: Fri, 15 Feb 2013 07:42:47 +0000 (-0800)
Subject: Merge branch 'bs3_jekyll' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~673
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae525258af17ef8f14259971442eacbec31d1d01;p=thirdparty%2Fbootstrap.git

Merge branch 'bs3_jekyll' into 3.0.0-wip

Conflicts:
	docs/css.html
	docs/templates/pages/css.mustache
---

ae525258af17ef8f14259971442eacbec31d1d01