]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'aronwoost-patch-1' into 2.3.0-wip
authorMark Otto <otto@github.com>
Thu, 10 Jan 2013 05:37:11 +0000 (21:37 -0800)
committerMark Otto <otto@github.com>
Thu, 10 Jan 2013 05:37:11 +0000 (21:37 -0800)

Trivial merge