Merge branch 'w02_MDL-30718_m23_usertimedb' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 9 Jan 2012 04:18:36 +0000 (12:18 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 9 Jan 2012 04:18:36 +0000 (12:18 +0800)

Trivial merge