Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 04:30:12 +0000 (12:30 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 04:30:12 +0000 (12:30 +0800)

Trivial merge