From: Mark Otto <otto@github.com>
Date: Fri, 6 Sep 2013 16:11:26 +0000 (-0700)
Subject: Merge branch 'GSEdits7' of https://github.com/StevenBlack/bootstrap into StevenBlack... 
X-Git-Tag: v3.0.1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=394161f281fc643d2f2ab7b7064972310730e018;p=thirdparty%2Fbootstrap.git

Merge branch 'GSEdits7' of https://github.com/StevenBlack/bootstrap into StevenBlack-GSEdits7

Conflicts:
	getting-started.html
---

394161f281fc643d2f2ab7b7064972310730e018