Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:07:47 +0000 (11:07 -0300)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:07:47 +0000 (11:07 -0300)
commit58798ecb524eb9fa97171bc7c165a21379832164
tree14f5e4fbbe8ceccaf95403ec2a9c27b1cdb9ce07
parent58f7a83036f7e003677e000a773ab16eb369701a
parent92f505171d39a21aa34e835cfcbdb0b13a8d13b0
Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle