Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 12:53:32 +0000 (14:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 12:53:32 +0000 (14:53 +0200)
commiteb4f0d9c84260f9a4c624c8c89780bc1a1034803
treea7c97023a608346105fef65eb56052bccc963c4d
parent9f4c5c542b6f817552b5cda49a4fdd2e78f6d4f9
parentaa60ab01c32d26460ecfda6e01bd74eda1c8760e
Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle