Merge branch 'MDL-30852-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 03:49:55 +0000 (13:49 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 03:49:55 +0000 (13:49 +1000)

Trivial merge