Merge branch '42060-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:39:30 +0000 (10:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:39:30 +0000 (10:39 +0800)
commit84cd1a2a9121d91b95013b6b2a6aaa0e831c1a98
treec6a3ff8b1c109d113d91be4fea063a88c6dbfb00
parent2a0a33a6ee652f50e63fc773d470df0ff6905fbc
parent19b13d531a5b691b3cac7c771155f8e4843f7323
Merge branch '42060-27' of git://github.com/samhemelryk/moodle