From: Mark Otto <markdotto@gmail.com>
Date: Mon, 10 Jun 2013 23:37:29 +0000 (-0700)
Subject: Merge pull request #8124 from eins78/3.0.0-wip-fix-json
X-Git-Tag: v3.0.0-rc1~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40751305f8beba8b769889bd0a8ac6e1af53648f;p=thirdparty%2Fbootstrap.git

Merge pull request #8124 from eins78/3.0.0-wip-fix-json

fix JSON syntax error in composer.json
---

40751305f8beba8b769889bd0a8ac6e1af53648f