Merge branch 'MDL-41664_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 02:08:23 +0000 (10:08 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:55:31 +0000 (08:55 +0800)

Trivial merge