]> 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>
Tue, 24 Jan 2012 20:28:37 +0000 (12:28 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 24 Jan 2012 20:28:37 +0000 (12:28 -0800)

Trivial merge