Merge branch 'MDL-53765-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 12:56:49 +0000 (13:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 12:56:49 +0000 (13:56 +0100)
commit017230d576194006ba1258a622f7929047aacc7c
tree784c8840135e26854c218b40d3cd4c7cff1bfd20
parentf616fc1b50a3d3c5f2659c935771ad02979ae9e1
parentd3932d2b5132e5632f28fb18619a4eeefeeafeaa
Merge branch 'MDL-53765-master' of git://github.com/junpataleta/moodle