Merge branch 'wip-MDL-42672-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commite17a5a4d21969f09f6efe62815a0ee2de18f1682
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Nov 2013 19:07:14 +0000 (12 20:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Nov 2013 19:07:14 +0000 (12 20:07 +0100)
tree624d446d480caea270e59537755e2e1d66c3c69b
parent63d05b24d9956931acc094d3a8797ccdbf0a8575
parent628c568f2d3d4070270eec204e85c291dfac8676
Merge branch 'wip-MDL-42672-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE