Merge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:14:28 +0000 (14:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:14:28 +0000 (14:14 +1300)

Trivial merge