Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 05:54:45 +0000 (15:54 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 05:54:45 +0000 (15:54 +1000)

Trivial merge