Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:28:53 +0000 (16:28 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:28:53 +0000 (16:28 +0800)

Trivial merge