]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' into new_striped_progress_bar_class
authorMark Otto <otto@github.com>
Thu, 19 Jun 2014 05:29:37 +0000 (22:29 -0700)
committerMark Otto <otto@github.com>
Thu, 19 Jun 2014 05:29:37 +0000 (22:29 -0700)

Trivial merge