Merge branch 'MDL-53256-m' of https://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Apr 2016 17:02:44 +0000 (19:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Apr 2016 17:02:44 +0000 (19:02 +0200)
commit8cdcf93d839d0a583c0b987ea2aadec78c3e3ace
tree5014f207bf4e6ee22e3359188b99e509c0e5e9c8
parentad6bdd1301ea14e59f6360d0ab351ae3ca24ebf3
parentf0ed09852e214ddeb6aa71caf3193800197a75ea
Merge branch 'MDL-53256-m' of https://github.com/micaherne/moodle