MarkBaker 1441011fb7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Classes/PHPExcel/Calculation/Functions.php
#	Classes/PHPExcel/Worksheet.php
#	Classes/PHPExcel/Worksheet/CellIterator.php
2018-11-23 00:07:24 +01:00
..
2015-12-06 16:04:32 +00:00