Merge branch 'MDL-35675-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 04:02:48 +0000 (12:02 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 04:02:48 +0000 (12:02 +0800)

Trivial merge