Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 03:48:00 +0000 (11:48 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:56:58 +0000 (08:56 +0800)

Trivial merge