Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 Oct 2013 09:24:06 +0000 (17:24 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:55:30 +0000 (08:55 +0800)

Trivial merge