Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:25:51 +0000 (09:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:25:51 +0000 (09:25 +1300)

Trivial merge