Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 9 Dec 2013 00:28:03 +0000 (11:28 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 9 Dec 2013 00:28:03 +0000 (11:28 +1100)

Trivial merge