Merge branch 'MDL-47194-master-fixes' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 9 Oct 2014 02:44:04 +0000 (15:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 9 Oct 2014 02:44:04 +0000 (15:44 +1300)

Trivial merge