]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'gh-pages' of github.com:twbs/bootstrap into gh-pages
authorMark Otto <otto@github.com>
Fri, 31 Jan 2014 18:42:48 +0000 (10:42 -0800)
committerMark Otto <otto@github.com>
Fri, 31 Jan 2014 18:42:48 +0000 (10:42 -0800)

Trivial merge