Merge branch 'MDL-50539-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:15:59 +0000 (09:15 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:15:59 +0000 (09:15 +0000)
commit8120cbd939700165ff47ba3813b82f692db9317e
tree9352d3254ccc8d348cfe9a37fc87975ea34d8f6e
parent48034807eed1e767783770e7712fb82d7e00f5c5
parentf24dcf0c60bf7da10f72094f5bea5eee59e09e7a
Merge branch 'MDL-50539-master' of git://github.com/jleyva/moodle