Merge branch 'MDL-32689' of git://github.com/jrchamp/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 05:10:56 +0000 (13:10 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 05:10:56 +0000 (13:10 +0800)

Trivial merge