From: Chris Rebert <code@rebertia.com>
Date: Mon, 4 Aug 2014 16:08:07 +0000 (-0700)
Subject: Merge branch 'KyleMit/add-default-settings-documentation'
X-Git-Tag: v3.3.0~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb2e9fe30c9f790b71a88aeb10563be267f429c2;p=thirdparty%2Fbootstrap.git

Merge branch 'KyleMit/add-default-settings-documentation'
---

fb2e9fe30c9f790b71a88aeb10563be267f429c2