Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 07:48:49 +0000 (15:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 07:48:49 +0000 (15:48 +0800)

Trivial merge