Merge branch 'MDL-45978_master' of git://github.com/grabs/moodle
commit033b14dc33f99fde19449ca30da42d00ea8d47bd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:54:33 +0000 (17 11:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:54:33 +0000 (17 11:54 +0200)
treee4cd322b662aeefc07acb7c515093f71d5e4cfdd
parentf393b3ecb1c9d6de50f8614baa7f99193bb82c14
parentec4e78a80f6e9c6d3058923b240b7d19aa0b5c2a
Merge branch 'MDL-45978_master' of git://github.com/grabs/moodle