From: kostyatretyak <ktretyakgm@gmail.com>
Date: Thu, 5 Dec 2013 23:36:53 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/twbs/bootstrap into edit
X-Git-Tag: v3.1.0~148^2~36^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ae7e0afe9c05dff74f69980d4ae39d3bb8af58b;p=thirdparty%2Fbootstrap.git

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

3ae7e0afe9c05dff74f69980d4ae39d3bb8af58b