]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Sun, 18 Jan 2015 21:39:50 +0000 (13:39 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 18 Jan 2015 21:39:50 +0000 (13:39 -0800)

Trivial merge