From: Mark Otto <otto@github.com>
Date: Mon, 19 Aug 2013 07:15:47 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff... 
X-Git-Tag: v3.0.0~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3260288df8273cd26749a4d2941ca3bc140e4a5a;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip
---

3260288df8273cd26749a4d2941ca3bc140e4a5a