Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 11 Dec 2013 20:13:42 +0000 (09:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 11 Dec 2013 20:13:42 +0000 (09:13 +1300)

Trivial merge