Merge branch 'MDL-42041-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Sep 2016 07:08:56 +0000 (15:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Sep 2016 07:08:56 +0000 (15:08 +0800)
commit9df9382e4d4c9b4d73a7175f6b987254fde06ec1
treeac1244e5451eb1b487aece5ee3cfe6b4cd115429
parent564cabb97a4384a9dd7cc2b3f1228205dfaca368
parent63d7b1acc01036b35b30c70591a0415fa118c6eb
Merge branch 'MDL-42041-master' of git://github.com/andrewnicols/moodle