Merge branch 'MDL-57868-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE
commit098a875e4e07f0b887a99271afa160e39543a973
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 22:42:46 +0000 (13 23:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 22:42:46 +0000 (13 23:42 +0100)
treea2dc769a23b039205c1129e179f5b88073cdeb4f
parent9d64f4f0783d1c796aeb74316a1aa750c6b6f4e3
parent13a2a8344c04898ee827c8b97b65b1958744a69e
Merge branch 'MDL-57868-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE