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)
commit5e319f510105796b9930437e8d78a502ec410cc2
tree446c90c64b4768fff5d470127c2cfca32b2cd9d1
parent7da590c11b0e84b62b740ad763a72e2cb890e779
parent9d82f6a836d4099843ca83a7f20654f524e4d753
Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle