]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' into need-to-activate-animated-progressbar
authorMark Otto <markdotto@gmail.com>
Sun, 26 Oct 2014 21:43:32 +0000 (14:43 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 26 Oct 2014 21:43:32 +0000 (14:43 -0700)

Trivial merge