From: Giuliano Velli <wpbrains@giusi.org>
Date: Tue, 24 Apr 2012 15:23:14 +0000 (+0200)
Subject: Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
X-Git-Tag: v2.2.0^2~90^2~1^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3168%2Fhead;p=thirdparty%2Fbootstrap.git

Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component

Conflicts:
	docs/components.html

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
---

3aa89ded21bbf4b8b846edd2e9755a0e31c4b79b