Merge branch 'MDL-36643-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 02:52:07 +0000 (10:52 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 02:52:07 +0000 (10:52 +0800)

Trivial merge