Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Nov 2015 00:54:50 +0000 (08:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Nov 2015 00:54:50 +0000 (08:54 +0800)
commitf2b28f81308c00afb14477fd4cf9a73875c48b9f
tree29988ce2c4ce17e3ab59f38c3489bb610a7a82be
parenta461fcf9db0e22958f0549d3598fe8f5a55d6648
parent600b8152791116d910bfa62a49070fd3469b5f7d
Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle