Merge branch 'MDL-40710-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 14:44:31 +0000 (15:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 14:44:31 +0000 (15:44 +0100)
commit6333b018adec0c730b4defff83d3a03ac8480852
treeb72c3579dab7f0cbd062e68ce4b98b4d9469269a
parent3975c5bc2e30080cacd92a52ece3c69585e5893a
parent0a5be447ce26e38b428b01da954fc73934be0ba5
Merge branch 'MDL-40710-master' of git://github.com/barbararamiro/moodle