Merge branch 'w32_MDL-13363_m24_dbuserundelete' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 8 Aug 2012 03:15:34 +0000 (11:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 8 Aug 2012 03:15:34 +0000 (11:15 +0800)

Trivial merge