]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sun, 3 Jun 2012 18:24:51 +0000 (11:24 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 3 Jun 2012 18:24:51 +0000 (11:24 -0700)

Trivial merge