Merge branch 'MDL-35981-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 02:19:45 +0000 (12:19 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 02:19:45 +0000 (12:19 +1000)

Trivial merge