]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2
authorMark Otto <markotto@twitter.com>
Sun, 15 Apr 2012 01:11:31 +0000 (18:11 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 15 Apr 2012 01:11:31 +0000 (18:11 -0700)

Trivial merge