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

Trivial merge