]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
authorMark Otto <markotto@twitter.com>
Wed, 5 Sep 2012 03:13:36 +0000 (20:13 -0700)
committerMark Otto <markotto@twitter.com>
Wed, 5 Sep 2012 03:13:36 +0000 (20:13 -0700)

Trivial merge