Merge branch 'MDL-50293_master' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jul 2015 11:51:46 +0000 (12:51 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jul 2015 11:51:46 +0000 (12:51 +0100)
commit8fb4743e1e04fdbb6d222d272e45a83f2ed29178
treee4f223e439bf163d1dad15ec0bd61b9e4cff8559
parent3dd2be1df72b672e69bac410048c8387d7027b0f
parent483fb4ec44afc2e7fe52107bd1d1d1b0809e4004
Merge branch 'MDL-50293_master' of https://github.com/Syxton/moodle