Merge branch 'MDL-57009-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
commitc20f9c66786d241485dd7a2bb074a21af7958e95
authorDan Poltawski <dan@moodle.com>
Tue, 7 Feb 2017 12:32:32 +0000 (7 12:32 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Feb 2017 12:32:32 +0000 (7 12:32 +0000)
treef83e627e0ad914ad5a78581ff77de6ccd2130447
parent556ca7fa168a42dcc5e3f8aad7a5a9833306cf30
parent893ed748bcc19808872ea6fb88f431a9d3dae1cf
Merge branch 'MDL-57009-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE