Merge branch 'MDL-48477_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE
commit45b68d3cdde525cd8e29452922831c7382378e78
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 17:44:43 +0000 (20 18:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 17:44:43 +0000 (20 18:44 +0100)
tree08b30c3afb9837b42404e957796f152caf6a0b7e
parent38e8b2623454c01875dd99c7d714aee2c9fc5fda
parent142c67ce07f9fb9ccd713f97b93828ce58cabde4
Merge branch 'MDL-48477_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE