]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Sun, 29 Jan 2012 21:25:36 +0000 (13:25 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 29 Jan 2012 21:25:36 +0000 (13:25 -0800)

Trivial merge