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

Trivial merge