Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:40:13 +0000 (09:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:40:13 +0000 (09:40 +1300)
commitdb00b9c8824b67585fc9f7066a17ae058a4f667a
tree8fc716f3b961f1555bd124d391d1a8461024d441
parent872b051fa38a0f512c793317f895253bd0746462
parent7e804d0cb403aa6f2aeac769669afed2f28e20c7
Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle