Merge branch 'MDL-36613-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:03:39 +0000 (15:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 07:03:39 +0000 (15:03 +0800)

Trivial merge