Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 22:18:14 +0000 (11:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 22:18:14 +0000 (11:18 +1300)

Trivial merge