]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into 2.1.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 2 Aug 2012 23:58:51 +0000 (16:58 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 2 Aug 2012 23:58:51 +0000 (16:58 -0700)

Trivial merge