]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Thu, 22 Jan 2015 03:20:59 +0000 (19:20 -0800)
committerMark Otto <markdotto@gmail.com>
Thu, 22 Jan 2015 03:20:59 +0000 (19:20 -0800)

Trivial merge