Merge branch 'MDL-50642' of https://github.com/ecampbell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 20:32:11 +0000 (22:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 20:32:11 +0000 (22:32 +0200)
commit30deee105c2fcb6537dbc2c32ab93f27a367397f
tree60cee6364f5554ef157c5d21886e0a97310b425e
parent1877b7551ee907cc639a6783965f30f28160c221
parentdcd4464ea34b3df76ba9578cd3945d181f067575
Merge branch 'MDL-50642' of https://github.com/ecampbell/moodle