Merge branch 'MDL-47978' of git://github.com/timhunt/moodle
commit968cc37437aae384795314411742071f6dd5281d
authorSam Hemelryk <sam@moodle.com>
Sun, 2 Nov 2014 22:27:55 +0000 (3 11:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 2 Nov 2014 22:27:55 +0000 (3 11:27 +1300)
treeb66ac5e28c7d95682b93d3a6c87677446edee79f
parent6863c0de492278df33ba222f8b25c0c1a4a3922b
parent262105faf9d0556451b64ab1faacf5129578283c
Merge branch 'MDL-47978' of git://github.com/timhunt/moodle