Merge branch 'MDL-51894-master' of git://github.com/andrewnicols/moodle
commitff1543e0df05a30b9dd2b940d43248d9cf426a89
authorDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 12:40:15 +0000 (26 12:40 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 12:40:15 +0000 (26 12:40 +0000)
treee027f0b08b136d4f759a2d362f013e0d5386edbd
parenteb154d9c1469b6f058c1be4c02e9e52321da3a84
parentfd424b99f202e8b0e8d3d72a3049bdefd29d05e3
Merge branch 'MDL-51894-master' of git://github.com/andrewnicols/moodle