]> 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>
Sat, 17 Aug 2013 20:18:19 +0000 (13:18 -0700)
committerMark Otto <otto@github.com>
Sat, 17 Aug 2013 20:18:19 +0000 (13:18 -0700)

Trivial merge