Merge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Nov 2014 16:30:17 +0000 (16:30 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Nov 2014 16:30:17 +0000 (16:30 +0000)
commitf820acf01e1344f156832ab8b3d4036950b6c9aa
tree73ca84ca82b1d101bc57d885268f7358e59f78c5
parent6ce4b8ea30ec3c5d843d0d8358c402f8302a2a65
parenta35ce611cf7d5679f27ae37be4b7bc595dc3f718
Merge branch 'MDL-47944-master' of git://github.com/andrewnicols/moodle