Merge branch 'master_MDL-36858' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 29 Nov 2012 04:53:25 +0000 (12:53 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 29 Nov 2012 04:53:25 +0000 (12:53 +0800)

Trivial merge