Merge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 21 Jan 2013 04:38:13 +0000 (12:38 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 21 Jan 2013 04:38:13 +0000 (12:38 +0800)

Trivial merge