Merge branch 'MDL-36392-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 09:11:21 +0000 (17:11 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 09:11:21 +0000 (17:11 +0800)

Trivial merge