Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 07:32:38 +0000 (07:32 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 07:32:38 +0000 (07:32 +0000)
commit5bd052f8092cb57e06f722ec45053577129b70ea
tree8f64cd102040c3a0f3f04f7068f2925d8c74670b
parentfb0d86f6717f1a4852308202cd233c823d08f5fd
parent7440c7b2986ce0234277e945cb05be9ff52250dc
Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle