Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 2 Oct 2013 07:27:03 +0000 (17:27 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 2 Oct 2013 07:27:03 +0000 (17:27 +1000)

Trivial merge