Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 16 Sep 2013 05:31:20 +0000 (15:31 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 16 Sep 2013 05:31:20 +0000 (15:31 +1000)

Trivial merge