Merge branch 'MDL-51128-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:07:10 +0000 (14:07 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:07:10 +0000 (14:07 +0000)
commit28aadc2b126d9bf8aca7029fe0fb9f86a10b282c
treecd5fb0f09d6beca60fc1533aa2fbec53902650d4
parent2088c22e41d40d71e86d4847d65ba10ff5867515
parentcef93f97aea16fa4c3fd12e0de568862e5bc49d3
Merge branch 'MDL-51128-master' of git://github.com/junpataleta/moodle