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

Trivial merge