Merge branch 'MDL-57601-m31' of https://github.com/sammarshallou/moodle into MOODLE_3...
commit8d1bf87c0e3f9bc7142cb42118d2cb11e4dfbd4f
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:23:07 +0000 (16 12:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:23:07 +0000 (16 12:23 +0000)
treeebfcc64f4e63f4ee939f22a427e346aa30379ff7
parentec4e2838cdfc59b8abb743cc7351edfc1d496411
parent691868bdaa8bc1659e13080accae74f08b8982bd
Merge branch 'MDL-57601-m31' of https://github.com/sammarshallou/moodle into MOODLE_31_STABLE