]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'bassjobsen-patch-6' into v4-dev
authorMark Otto <markdotto@gmail.com>
Tue, 8 Dec 2015 07:48:41 +0000 (23:48 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 8 Dec 2015 07:48:41 +0000 (23:48 -0800)

Trivial merge