Merge branch 'MDL-31926-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:12:54 +0000 (12:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:12:54 +0000 (12:12 +0800)

Trivial merge