]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'thr3-arendt/patch-1'
authorChris Rebert <code@rebertia.com>
Thu, 4 Sep 2014 23:59:02 +0000 (16:59 -0700)
committerChris Rebert <code@rebertia.com>
Thu, 4 Sep 2014 23:59:13 +0000 (16:59 -0700)

Trivial merge