Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 8 Nov 2013 03:11:28 +0000 (11:11 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 8 Nov 2013 03:11:28 +0000 (11:11 +0800)
commit379cbb459aa84c3970cba2098dd1ce78c3599ff7
treebb134f1c4d97b6ba21676f357c3495ea0b157cc9
parent9fec5cb3330321b62ac5aa21fb6d5d602d8803b0
parentec477ba1bbdb7c70bb05694866b5459debe50aff
Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle