]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.0-wip' of https://github.com/smerik/bootstrap into smerik-2.1.0-wip
authorMark Otto <markotto@twitter.com>
Sat, 18 Aug 2012 23:31:13 +0000 (16:31 -0700)
committerMark Otto <markotto@twitter.com>
Sat, 18 Aug 2012 23:31:13 +0000 (16:31 -0700)

Trivial merge