Merge branch 'MDL-50545-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:15:50 +0000 (09:15 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:15:50 +0000 (09:15 +0000)
commit48034807eed1e767783770e7712fb82d7e00f5c5
tree2bd2cb77d2f29c339416ae98c049ad02ee62b343
parent79b717ec04820e9fea4a7955f75b32db0e5959df
parentda1205ccc2cda1634114d6c9ed43466a54f2373d
Merge branch 'MDL-50545-master' of git://github.com/jleyva/moodle