Merge branch 'MDL-50549-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 06:52:07 +0000 (06:52 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 06:52:07 +0000 (06:52 +0000)
commitfb0d86f6717f1a4852308202cd233c823d08f5fd
tree48c7fefe392d1fe8b6aa328baac1f746fdd1790b
parentcd0e2e89f2f6eee920fb9c1b7d6b7dc5fac95596
parentc76d5fd63ef3c6c8a84a63245532ee1f26fa990a
Merge branch 'MDL-50549-master' of git://github.com/jleyva/moodle