]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into fix-travis-v4 17050/head
authorThomas McDonald <thomasm@palantir.com>
Tue, 25 Aug 2015 17:00:36 +0000 (10:00 -0700)
committerThomas McDonald <thomasm@palantir.com>
Tue, 25 Aug 2015 17:00:36 +0000 (10:00 -0700)

Trivial merge