Merge branch 'MDL-41778_master' of https://github.com/nitzo/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:52:39 +0000 (12:52 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:52:39 +0000 (12:52 +1000)

Trivial merge