From: Chris Rebert <github@rebertia.com>
Date: Thu, 19 Mar 2015 05:04:54 +0000 (-0700)
Subject: Merge pull request #16101 from guybedford/master
X-Git-Tag: v3.3.5~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb4144af85e572be5b56ac458eaea8122aa5c82e;p=thirdparty%2Fbootstrap.git

Merge pull request #16101 from guybedford/master

Update jspm configuration
---

cb4144af85e572be5b56ac458eaea8122aa5c82e