Merge branch 'MDL-34629-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:19:32 +0000 (14:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:19:32 +0000 (14:19 +0800)

Trivial merge