Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 19:37:03 +0000 (08:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 19:37:03 +0000 (08:37 +1300)
commit2dc15b1011f26a161a9d0a3c3451e6668993f4ce
tree9455139fccc1c7f0ff2df927eb186d5be290a9c4
parent2219f50a103eac8d44c5cda7b66f650e953ab28e
parentff715cc93649bc0cdd636ec76b66414b66b8ff63
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle