Merge branch 'mdl58161-moodle33' of https://github.com/tlock/moodle into MOODLE_33_STABLE
commit290ec233f5d522075d91eed1c3e6ec584d65d2df
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:21:54 +0000 (13 01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 23:21:54 +0000 (13 01:21 +0200)
treefd1161bb29e663e1ead8f9f5d5c949cce7014da4
parent56aa74ed3c2f58e065451480f69d8c67d511a616
parent57fb48743f21ea5cca27f95015341261855ad4b8
Merge branch 'mdl58161-moodle33' of https://github.com/tlock/moodle into MOODLE_33_STABLE