]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'tekezo-patch-1' into 2.1.0-wip
authorMark Otto <markotto@twitter.com>
Mon, 25 Jun 2012 23:49:13 +0000 (16:49 -0700)
committerMark Otto <markotto@twitter.com>
Mon, 25 Jun 2012 23:49:13 +0000 (16:49 -0700)

Trivial merge