Merge branch 'MDL-50394_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:32:45 +0000 (18:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:32:45 +0000 (18:32 +0200)
commitd4d1b2b5a3eecf81b8c53e9b8d1848f15049e238
treee1aaf9fec70f5912a6c771027fc700180ddcb0cf
parent6422f03f15917d04749f450465488d93e1caa39d
parent9758da6ed55a1d55c039e5c71fafa49d0acdce3a
Merge branch 'MDL-50394_master' of git://github.com/markn86/moodle