Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 02:56:45 +0000 (10:56 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:55:32 +0000 (08:55 +0800)

Trivial merge