]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
authorfat <jacobthornton@gmail.com>
Tue, 30 Oct 2012 04:55:07 +0000 (21:55 -0700)
committerfat <jacobthornton@gmail.com>
Tue, 30 Oct 2012 04:55:07 +0000 (21:55 -0700)

Trivial merge