]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sun, 8 Jan 2012 19:24:16 +0000 (11:24 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 8 Jan 2012 19:24:16 +0000 (11:24 -0800)

Trivial merge