]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret
authorMark Otto <otto@github.com>
Sun, 18 Aug 2013 17:07:34 +0000 (10:07 -0700)
committerMark Otto <otto@github.com>
Sun, 18 Aug 2013 17:07:34 +0000 (10:07 -0700)

Trivial merge