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

Trivial merge