Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)
commit2bc40fc889c8f5d0b791ff06e5a88cdf7138ef45
treea902688fb4a704759c7de25772ab5cc6c7395028
parenta3f22d315f7b9eacf41a41adc5026f10612a720d
parent65b26a461e028429dda21f30f9203f3fc64df3bc
Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle