Merge branch 'MDL-47847-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:35:50 +0000 (16:35 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:35:50 +0000 (16:35 +0100)

Trivial merge