Merge branch 'MDL-34182-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 22 Dec 2013 20:54:44 +0000 (09:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 22 Dec 2013 20:54:44 +0000 (09:54 +1300)

Trivial merge