Merge branch 'MDL-53065' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Feb 2016 22:01:04 +0000 (23:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Feb 2016 22:01:04 +0000 (23:01 +0100)
commit153fbcd24a729f23062a3ca5bd919ef7bd9b10df
tree687d13406b4f8a302585d195b26d3866e1ea65ff
parentc5a4c64fcc62fb454a4d7928499f99f04c557d84
parent293f5d1b112f1ef084e1e6c2f3eaf988e5e3e475
Merge branch 'MDL-53065' of git://github.com/timhunt/moodle