Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 06:52:21 +0000 (14:52 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 06:52:21 +0000 (14:52 +0800)

Trivial merge