Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2014 22:32:38 +0000 (23:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2014 22:32:38 +0000 (23:32 +0100)
commitb3b1b18a4f055e114afda108626dd89d1078db7b
tree4dbef2421fa6165834106dcab0847c3f6cb55cf5
parent7d374cdf4aaac4d226fff63e9cec41273c360347
parentfd2dcaa603aaf02f998b5573b72944680f1c8f8a
Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle