]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' into carousel_indicators_ie
authorMark Otto <otto@github.com>
Sun, 20 Oct 2013 23:53:57 +0000 (16:53 -0700)
committerMark Otto <otto@github.com>
Sun, 20 Oct 2013 23:53:57 +0000 (16:53 -0700)

Trivial merge