Merge branch 'MDL-54121-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 03:16:34 +0000 (11:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:12 +0000 (17:16 +0800)
commitf0a2dbf188cf180d0e1bd326f762d55f7fb18479
treeef51a03d32cf000601cdf6c18c6ec7e973e5a343
parent96fd37749e9d7c82c2c8ba3529d6efe422b4776f
parent6885517d78a8a7659c2ef24bf9ecabab02795341
Merge branch 'MDL-54121-master' of git://github.com/damyon/moodle