Merge branch 'MDL-52491-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:35:25 +0000 (11:35 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:35:25 +0000 (11:35 +0000)
commit73c2ae931d2b6776aca9860d77d959656588be60
tree76ffafd5d3919e2b527c12fc17b4613d001e3c86
parente7cacf211e584d633e4757df58f68d8b24ec921b
parent8e2707b92b40287b3a57a1a3976d31995c1157b8
Merge branch 'MDL-52491-master' of git://github.com/jleyva/moodle