Merge branch 'MDL-52693-29' of git://github.com/andrewnicols/moodle into MOODLE_29_STABLE
commit2362ba8beb49e82ecad50f7305658b444bdfbaad
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jan 2016 20:44:43 +0000 (18 21:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jan 2016 20:44:43 +0000 (18 21:44 +0100)
tree09e9b2aa5776f310abf21cd5ad57304bc5cca16b
parent1b10b7b97977eb8a518fb464a6a0aabda83a1766
parent01258058c2d75625bcfdb20a9ee8b6be1212331c
Merge branch 'MDL-52693-29' of git://github.com/andrewnicols/moodle into MOODLE_29_STABLE