Merge branch 'w29_MDL-40549_m26_oacleanup' of https://github.com/skodak/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 07:07:23 +0000 (17:07 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 07:07:23 +0000 (17:07 +1000)

Trivial merge