Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle
commitf5d9072e5155c642450651061271493d03ae98f0
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 01:14:09 +0000 (2 09:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 01:14:09 +0000 (2 09:14 +0800)
tree1ce58b3a4fe3b1558913b37d550aabd81f67f040
parentb7959d831de367b0ae1d942082a1987890e617b5
parent58488d0ff01336482b426bffba9555491b830c5c
Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle