MarkBaker 7d9f45c176 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts:
	Classes/PHPExcel/Calculation.php
	Classes/PHPExcel/Cell.php
2015-05-13 17:02:34 +01:00
..