]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sun, 8 Jun 2014 20:28:56 +0000 (13:28 -0700)
committerMark Otto <otto@github.com>
Sun, 8 Jun 2014 20:28:56 +0000 (13:28 -0700)

Trivial merge