Merge branch 'MDL-60348-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 14:53:53 +0000 (15:53 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 14:53:53 +0000 (15:53 +0100)
commit860d33c90acfbc99844de804857adde5a21b5c58
tree15a2e4e47460ce47533ed22f1c2fdd16194563e3
parent6065875eacab67c16ab221301e624fd851af5a2e
parent7336f854e64cfa80b6d912a91750efc5d0e526cb
Merge branch 'MDL-60348-master' of git://github.com/jleyva/moodle