]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of http://git.local.twitter.com/bootstrap
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 30 Jun 2011 20:47:23 +0000 (13:47 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 30 Jun 2011 20:47:23 +0000 (13:47 -0700)

Trivial merge