]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sat, 30 Nov 2013 20:52:45 +0000 (12:52 -0800)
committerMark Otto <otto@github.com>
Sat, 30 Nov 2013 20:52:45 +0000 (12:52 -0800)

Trivial merge