Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 04:45:14 +0000 (14:45 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 04:45:14 +0000 (14:45 +1000)

Trivial merge