]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip
authorMark Otto <markotto@twitter.com>
Tue, 21 Aug 2012 21:42:25 +0000 (14:42 -0700)
committerMark Otto <markotto@twitter.com>
Tue, 21 Aug 2012 21:42:25 +0000 (14:42 -0700)

Trivial merge