Merge branch 'MDL-45843-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 08:34:39 +0000 (09:34 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 08:34:39 +0000 (09:34 +0100)
commitbef6e88b5da7a968fe2e69194bce4aca8e4b9e51
tree76238da6f72ca6aecc61d443f00b78c6c22ea992
parente435f174d3988785ebe8bd6a23e5aa2df91c16d6
parent7c2977bc5b461b263613397336330c853626397e
Merge branch 'MDL-45843-master-fix1' of github.com/damyon/moodle