Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:48:25 +0000 (09:48 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:48:25 +0000 (09:48 +0100)
commit7e704313d2791b70f438ddbc53c447c5d658f738
treee89b37c477480ced1cb8e1874889d3302eb9f782
parent2e8101f6e67e15d81b45811f4e8a9398ee9b492f
parent6849d15df51c3301aa75f941b36742d9035acc76
Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle