]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'trsteel88-master' into 2.2.2-wip
authorMark Otto <otto@github.com>
Wed, 28 Nov 2012 23:35:16 +0000 (15:35 -0800)
committerMark Otto <otto@github.com>
Wed, 28 Nov 2012 23:35:16 +0000 (15:35 -0800)

Trivial merge