Merge branch 'MDL-36455_master' of git://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 20:30:35 +0000 (09:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Dec 2012 20:30:35 +0000 (09:30 +1300)

Trivial merge