Merge branch 'MDL-36471-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 03:01:53 +0000 (11:01 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 03:01:53 +0000 (11:01 +0800)

Trivial merge