Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 06:22:38 +0000 (16:22 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 06:22:38 +0000 (16:22 +1000)

Trivial merge