Merge branch 'MDL-52137-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 02:55:59 +0000 (10:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 02:55:59 +0000 (10:55 +0800)
commit51f322023fbdb594d3b252bc5570fb4043bd73d7
tree9f5af931d06437f5dc18754161aff78bb077ebe6
parent3bb9f374e73069a12229db9183f6d64a7796d59c
parentfa544b236d00229ee6c000758b794ad597d4933a
Merge branch 'MDL-52137-master' of git://github.com/andrewnicols/moodle