]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Wed, 22 Jan 2014 21:37:11 +0000 (15:37 -0600)
committerMark Otto <otto@github.com>
Wed, 22 Jan 2014 21:37:11 +0000 (15:37 -0600)

Trivial merge