]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
authorMark Otto <markotto@twitter.com>
Sun, 17 Jun 2012 19:40:43 +0000 (12:40 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 17 Jun 2012 19:40:43 +0000 (12:40 -0700)

Trivial merge