Merge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:04:43 +0000 (11:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:04:43 +0000 (11:04 +1200)
1  2 
lib/filestorage/file_storage.php
lib/filestorage/stored_file.php

Simple merge
Simple merge