Merge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 02:42:04 +0000 (10:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 02:42:04 +0000 (10:42 +0800)

Trivial merge