]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sun, 11 Aug 2013 22:17:30 +0000 (15:17 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 11 Aug 2013 22:17:30 +0000 (15:17 -0700)

Trivial merge