Merge branch 'MDL-24419' of git://github.com/danpoltawski/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 12:46:21 +0000 (20:46 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 12:46:21 +0000 (20:46 +0800)

Trivial merge