Merge branch 'MDL-52983_30' of git://github.com/aolley/moodle into MOODLE_30_STABLE
commit27802334e21af95743683de8713a0c7af1cf3f42
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 12:05:39 +0000 (8 13:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 12:05:39 +0000 (8 13:05 +0100)
tree05a7494f73d791416393b6cbc28cd8f6001a3c7f
parent3bfe6aa8775a65cf2db40e9b1dd9546f4652549f
parent10bf1500dac294b6aaec655cc3d2f9355f8cab73
Merge branch 'MDL-52983_30' of git://github.com/aolley/moodle into MOODLE_30_STABLE