]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'idavemm-patch-1' into 2.2.2-wip
authorMark Otto <otto@github.com>
Fri, 30 Nov 2012 07:26:22 +0000 (23:26 -0800)
committerMark Otto <otto@github.com>
Fri, 30 Nov 2012 07:26:22 +0000 (23:26 -0800)

Trivial merge