From: Mark Otto <otto@github.com>
Date: Sun, 18 Aug 2013 17:07:34 +0000 (-0700)
Subject: Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret
X-Git-Tag: v3.0.0~69^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9e741bffc47d683e8588c09afece4cdee27cfd8;p=thirdparty%2Fbootstrap.git

Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret
---

a9e741bffc47d683e8588c09afece4cdee27cfd8