Merge branch 'w51_MDL-30765_m23_context' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 21:21:35 +0000 (10:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 21:21:35 +0000 (10:21 +1300)

Trivial merge