]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sun, 15 Dec 2013 22:14:32 +0000 (14:14 -0800)
committerMark Otto <otto@github.com>
Sun, 15 Dec 2013 22:14:32 +0000 (14:14 -0800)

Trivial merge