Merge branch 'MDL-58030' of git://github.com/aolley/moodle
commit06fb1df811e7761a0cd316481c0e92a31f012ed1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2017 21:47:14 +0000 (27 22:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2017 21:47:14 +0000 (27 22:47 +0100)
treeb0edbae4ff3f6dc426e39375c2e56c4d6f4e966b
parentd21b71fb1a3df919ab3fc11565921c891e31bdc0
parent767761b7d84bc70b863cef41b2717cfe3616814c
Merge branch 'MDL-58030' of git://github.com/aolley/moodle