]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 28 Aug 2012 04:27:31 +0000 (21:27 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 28 Aug 2012 04:27:31 +0000 (21:27 -0700)

Trivial merge