Merge branch 'MDL-57270_32' of git://github.com/markn86/moodle into MOODLE_32_STABLE
commit4942dfc7cdccc1ef3050e00c63a4502759ebcb17
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:04:25 +0000 (19 13:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:04:25 +0000 (19 13:04 +0100)
treede8d9b0fe4bda001201329cda8fe7968e889e777
parentd469fb2181ed73bd848ce73e8276e1915613fe29
parentf927f3e196dba8a9976f81262d1be57d09d4312d
Merge branch 'MDL-57270_32' of git://github.com/markn86/moodle into MOODLE_32_STABLE