Merge branch 'wip-MDL-31776-master-alternatenamesfix' of git://github.com/abgreeve...
authorMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 10:16:21 +0000 (20:16 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 10 Jul 2013 10:16:21 +0000 (20:16 +1000)

Trivial merge