Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:21 +0000 (11:48 +0200)

Trivial merge