Git commits in Moodle x.x.x by David Risner

commit 54df1bdcf79770dde080ad0c30a7432199ed31e9
Author: David Risner <drisner@calstate.edu>
Date:   Tue, 12 Apr 2016 07:28:55 +0800
Tag:    v2.9.6

MDL-53095 repository_merlot: change merlot url use https


commit 9f1b6babf0b3b30b354d3ce6be621ab106cf38c6
Author: David Risner <drisner@calstate.edu>
Date:   Tue, 12 Apr 2016 07:28:55 +0800
Tag:    v3.0.4

MDL-53095 repository_merlot: change merlot url use https


commit 4584c3de23b522ab4eb9f794e5063fa094394529
Author: David Risner <drisner@calstate.edu>
Date:   Tue, 12 Apr 2016 07:28:55 +0800
Tag:    v3.1.0-beta

MDL-53095 repository_merlot: change merlot url use https