Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 15:02:09 +0000 (16:02 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 15:02:09 +0000 (16:02 +0100)
commit6315aa24f90bae4c6e842d7a47f1ba6258486357
tree7702de5f88fb617c809f60ca86f736b5a533ae5c
parent5990febb0c0c0eac2d8c339069c8a990f1e13834
parent93c51a1d0a534d425e4257641e5d00303dd7c8d5
Merge branch 'MDL-46171-master-fix1' of github.com/damyon/moodle