From: Mark Otto <otto@github.com>
Date: Thu, 18 Jul 2013 07:43:48 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3... 
X-Git-Tag: v3.0.0-rc1~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1363ffa473a7f68e540563632aaf8293cf1be5fc;p=thirdparty%2Fbootstrap.git

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

1363ffa473a7f68e540563632aaf8293cf1be5fc