From: Mark Otto <otto@github.com>
Date: Sun, 3 Feb 2013 01:01:29 +0000 (-0800)
Subject: Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara... 
X-Git-Tag: v3.0.0-rc1~716
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04aae2f56cca4438c90232b889fa5a6e1d78d223;p=thirdparty%2Fbootstrap.git

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

04aae2f56cca4438c90232b889fa5a6e1d78d223