Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 19 Nov 2014 20:12:14 +0000 (09:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 19 Nov 2014 20:12:14 +0000 (09:12 +1300)
commit7a5e6054248ef18f05a228ab0db4d05e5d782180
tree012dfe53b35175674f3388f92d168df4c928b1b0
parent7b9fb265d20e53580a64dcd2be8546ff5b49bd26
parentdb97ff0ee604b4a2de6d9d43edea89c2b249ed09
Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle