From: Mark Otto <otto@github.com>
Date: Fri, 26 Jul 2013 20:51:27 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3... 
X-Git-Tag: v3.0.0-rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ad3e1e8a79608cab9466a73f3d86b1c4787ae2f;p=thirdparty%2Fbootstrap.git

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

1ad3e1e8a79608cab9466a73f3d86b1c4787ae2f