Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 23:28:29 +0000 (07:28 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 23:28:29 +0000 (07:28 +0800)

Trivial merge