Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 07:40:06 +0000 (15:40 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 07:40:06 +0000 (15:40 +0800)
commit64f7d154db77190ee760bf81f8c85a978ef3560e
tree7cbd7b128b5b7f8c14ae97822e75ab293b08cc1a
parentdefcb763fe44034d6aa425dabcc4b942603b145e
parent13041f21254c2d3306d1ff2dcf3b0ad4a0b9fe78
Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle

Conflicts:
lib/tests/csvclass_test.php
lib/csvlib.class.php
lib/tests/csvclass_test.php