]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Fri, 24 Oct 2014 20:24:34 +0000 (13:24 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 24 Oct 2014 20:24:34 +0000 (13:24 -0700)

Trivial merge