]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Tue, 21 Jan 2014 04:12:02 +0000 (22:12 -0600)
committerMark Otto <otto@github.com>
Tue, 21 Jan 2014 04:12:02 +0000 (22:12 -0600)

Trivial merge