]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Mon, 29 Jul 2013 19:29:22 +0000 (12:29 -0700)
committerMark Otto <otto@github.com>
Mon, 29 Jul 2013 19:29:22 +0000 (12:29 -0700)

Trivial merge