Merge branch 'MDL-30674-master-wip' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 23 Oct 2015 10:18:08 +0000 (12:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 23 Oct 2015 10:46:53 +0000 (12:46 +0200)

Trivial merge