Merge branch 'MDL-50370' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:43:10 +0000 (12:43 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:43:10 +0000 (12:43 +0100)
commit0618747ce3b818bedb4f41a08269988a0f65bcdb
tree32cd907c0131da331749533b6a124ecec92be035
parent55155aeee25eddffb76a3c3fc0d30887a86a65c4
parent265f4f388c2e915d16c4ae620cadfa66f08f3a54
Merge branch 'MDL-50370' of git://github.com/barbararamiro/moodle