From: Mark Otto <otto@github.com>
Date: Sat, 25 May 2013 04:18:07 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of https://github.com/hppycoder/bootstrap into hppycoder... 
X-Git-Tag: v3.0.0-rc1~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ea070bdf600a26bbf7da31db94aa76f64c5423f;p=thirdparty%2Fbootstrap.git

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

5ea070bdf600a26bbf7da31db94aa76f64c5423f