Merge branch 'MDL-53430-master' of git://github.com/merrill-oakland/moodle
commit1e60d7e482530dce500d93a0ba9255c3319691a0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:03:31 +0000 (16 00:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:03:31 +0000 (16 00:03 +0100)
tree184fda2f12388bdb69f3513b0aed8ac07dc378ec
parent1d57167f1568350cfb36ba996a2faf7ad4921885
parent208a79c9207787e2addea8b4ac3137a2e9fc54cb
Merge branch 'MDL-53430-master' of git://github.com/merrill-oakland/moodle