Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 27 Nov 2013 03:32:23 +0000 (11:32 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 27 Nov 2013 03:32:23 +0000 (11:32 +0800)

Trivial merge