]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.2.2-wip-holder' into 2.2.2-wip
authorMark Otto <otto@github.com>
Fri, 30 Nov 2012 05:35:57 +0000 (21:35 -0800)
committerMark Otto <otto@github.com>
Fri, 30 Nov 2012 05:35:57 +0000 (21:35 -0800)

Trivial merge