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)
commit4c9da232d05f324d4f077aace13393b2da7b2c27
tree0814ee2fbacd40df1ee92d120e94e56daebc56fe
parentd6cb394f2c749b3ed2f961550885f556f1ecef94
parentef5e1151c18bca3aea5a15e2013333dea166bf00
Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle