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)
commitd106cf1d7dba0ca597d9d8f60ca249ac78a333a0
tree93b33690e280294e265ef428bbdc5e565a1aadd8
parentb8644958e37b3b1fcbc6328cdf4c00565b1f9843
parentfb1ec806c537d83061f2abcd14e1c7a9ea827eb3
Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle