Merge branch 'w32_MDL-34585_m24_blogfiles' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 01:45:46 +0000 (09:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 01:45:46 +0000 (09:45 +0800)

Trivial merge