Merge branch 'w51_MDL-37281_m23_othersnav' of git://github.com/skodak/moodle into...
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:33:45 +0000 (13:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:33:45 +0000 (13:33 +1300)

Trivial merge