Merge branch 'MDL-20367-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:41:58 +0000 (10:41 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:41:58 +0000 (10:41 +0100)

Trivial merge