Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 19:37:03 +0000 (08:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 19:37:03 +0000 (08:37 +1300)

Trivial merge