Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 06:58:56 +0000 (14:58 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 06:58:56 +0000 (14:58 +0800)

Trivial merge