From: Zac Echola <zac.echola@so.mnscu.edu>
Date: Tue, 28 Apr 2015 14:45:16 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons
X-Git-Tag: v3.3.5~41^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons
---

407e8dc9d8d8e28d456a37d9d69e1d3c89d6fbb4