Merge branch 'MDL-47707-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:43:52 +0000 (10:43 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:43:52 +0000 (10:43 +0100)

Trivial merge