Merge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 08:30:38 +0000 (16:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 08:30:38 +0000 (16:30 +0800)
commit0575c5ad8c12b32092bbb0e8e0e73b1fc5ae109e
treec91633faea379257fb3adb1aaf0b4ce50b707b2e
parentf20abd87590e3cabf890257c62ce520bf244fdd5
parente90eb13a6b762b39a93ead98ffdc336c0b7b12f7
Merge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle