Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 09:51:33 +0000 (17:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 09:51:33 +0000 (17:51 +0800)

Trivial merge