Merge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle
commitbcf9c54c20842e7df213809eef25fb56ead20398
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Aug 2015 22:06:01 +0000 (25 00:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Aug 2015 22:06:01 +0000 (25 00:06 +0200)
tree217f894503c0f50974a1e50a2593f0633ae580b9
parentee9b9ffd5118fce4a777c1157ccf72c729bf5fb2
parentbff7570e87f2184a821d691f32e303fb6b628e4a
Merge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle