Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 00:21:06 +0000 (08:21 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 00:21:06 +0000 (08:21 +0800)

Trivial merge