From: Mark Otto <markotto@twitter.com>
Date: Tue, 18 Sep 2012 01:15:44 +0000 (-0700)
Subject: Merge branch 'wpbrains-media-component' into 2.1.2-wip
X-Git-Tag: v2.2.0^2~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26ca131a950398e0c3c447da01658939feb40df1;p=thirdparty%2Fbootstrap.git

Merge branch 'wpbrains-media-component' into 2.1.2-wip
---

26ca131a950398e0c3c447da01658939feb40df1