Merge branch 'MDL-36470-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:58:19 +0000 (15:58 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:58:19 +0000 (15:58 +0800)

Trivial merge