Merge branch 'm30_MDL-51554_Apache_PHP-FPM_Broken_File_Serving' of https://github...
authorDan Poltawski <dan@moodle.com>
Mon, 19 Oct 2015 14:19:41 +0000 (15:19 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Oct 2015 14:19:41 +0000 (15:19 +0100)

Trivial merge