Merge branch 'MDL-36011-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 07:15:38 +0000 (17:15 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 07:15:38 +0000 (17:15 +1000)

Trivial merge