Merge branch 'MDL-48947_v3_patch' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 Oct 2015 15:12:09 +0000 (16:12 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 1 Oct 2015 15:12:09 +0000 (16:12 +0100)
commit331315a4c1741b5261a5af514d49a8a6c40aa152
tree8130d928e674d1f27eb1f1036a0a2d643d4ddfa8
parent6dbb46ec0fb69a5c5f53d32e71456ab81693ea94
parentc73fd11e867206dddd0db2adb761bf1d9aa334a5
Merge branch 'MDL-48947_v3_patch' of https://github.com/Syxton/moodle