Merge branch 'MDL-52209-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 15:04:40 +0000 (15:04 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 15:04:40 +0000 (15:04 +0000)
commitde6e67940fd9d3e85f07a0feae6ef7e49c253074
treefcbc80be4677dc6c1f21447000f1c574485bfd03
parent6c0bf99b5b71be74d6da8eb0450bb143c243df0a
parent0af5593122aafd543b72bcb6d40c73a382e46d8c
Merge branch 'MDL-52209-master' of git://github.com/junpataleta/moodle