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

Trivial merge