Merge branch 'w02_MDL-30928_m23_deletetimes' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Jan 2012 00:52:37 +0000 (13:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Jan 2012 00:52:37 +0000 (13:52 +1300)

Trivial merge