Merge branch 'MDL-33839c' of git://github.com/mkassaei/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 27 Jan 2014 02:28:47 +0000 (15:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 27 Jan 2014 02:28:47 +0000 (15:28 +1300)

Trivial merge