Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 00:43:08 +0000 (13:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 00:43:08 +0000 (13:43 +1300)

Trivial merge