Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Jul 2014 21:31:34 +0000 (09:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Jul 2014 21:31:34 +0000 (09:31 +1200)
commitda6ddbf8e64816275bedfa01411d708140fd9b20
treebfc4320f09062f6860b1d696f2bfdea4804d7118
parent4c92c676e310c30b3056167cf653fcad23d146c8
parentacbf4579d59c8f23c50f8d250675889a059c0e89
Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle