Merge branch 'develop' of https://github.com/PHPOffice/PhpSpreadsheet into develop

MarkBaker · MarkBaker · commit 55ef87adc47b · 2016-08-05T00:23:24.000+01:00
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
             "homepage": "http://blog.maartenballiauw.be"
         },
         {
-            "name": "Mark Baker"
+            "name": "Mark Baker",
             "homepage": "http://markbakeruk.net"
         },
         {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"homepage": "http://blog.maartenballiauw.be"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`		`- "name": "Mark Baker"`
	`14`	`+ "name": "Mark Baker",`
`15`	`15`	`"homepage": "http://markbakeruk.net"`
`16`	`16`	`},`
`17`	`17`	`{`