From: Mark Otto <otto@github.com>
Date: Thu, 18 Jul 2013 20:07:17 +0000 (-0700)
Subject: Merge branch 'bs3_add_ads' into bs3_rc1
X-Git-Tag: v3.0.0-rc1~120^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9425382376133c9db7a7fa55bb78acf07e2f167e;p=thirdparty%2Fbootstrap.git

Merge branch 'bs3_add_ads' into bs3_rc1
---

9425382376133c9db7a7fa55bb78acf07e2f167e