]> 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>
Sun, 18 Aug 2013 22:30:02 +0000 (15:30 -0700)
committerMark Otto <otto@github.com>
Sun, 18 Aug 2013 22:30:02 +0000 (15:30 -0700)

Trivial merge