Merge branch 'MDL-39281-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 22 Apr 2013 22:17:03 +0000 (10:17 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 22 Apr 2013 22:17:03 +0000 (10:17 +1200)

Trivial merge