Merge branch 'MDL-45675_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
commit1ec46dca1dff091e1959ac6d0b5bb028641ce2d6
authorDan Poltawski <dan@moodle.com>
Mon, 26 May 2014 10:59:26 +0000 (26 11:59 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 26 May 2014 10:59:26 +0000 (26 11:59 +0100)
tree9cd71ec2992702c2edc321c4f3e6f0db74ab3296
parenta8b6eaa3c47be996c404e0409498d20e480aacd8
parent47235557d29f7e95448e50fd8f114f7bda97caa6
Merge branch 'MDL-45675_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE