Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 05:20:42 +0000 (13:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 05:20:42 +0000 (13:20 +0800)
commitc10cd185a9f3b5f1e24dfb1405a6f370ec73d2ef
treed050429a2b109a018f612d919739bbcc6086ea6e
parent0c6cf86925fa58e23f9de221e015faec22302dca
parent4ceed4dfa6488025e9e8e3a4982ec022f0f2bb9c
Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle