Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 15:34:18 +0000 (23:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 15:34:18 +0000 (23:34 +0800)

Trivial merge