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)
committerSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)

Trivial merge