Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 05:34:18 +0000 (13:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 05:34:18 +0000 (13:34 +0800)

Trivial merge