Merge branch 'MDL-45676_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
commitc5549ab4757b13bd0d9780e4b429d74e0c78fda5
authorDan Poltawski <dan@moodle.com>
Mon, 26 May 2014 11:02:43 +0000 (26 12:02 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 26 May 2014 11:02:43 +0000 (26 12:02 +0100)
treeaea5580eb2c5d961477bf7500e9c2d5536f88c1e
parent1ec46dca1dff091e1959ac6d0b5bb028641ce2d6
parent7221132d117cd9ff45deecf91d7efd8df15ae985
Merge branch 'MDL-45676_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE