Merge branch 'MDL-52333_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Dec 2015 11:03:50 +0000 (11:03 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Dec 2015 11:03:50 +0000 (11:03 +0000)
commitaa45186ad295f1d363b6fa648ec06d28c61e0df9
tree7b134b542fab43ef1bdda7559724dfc455a1b7fd
parent1bd60ff6a536a6fff74eb30779e2549218d7ce27
parente574148c506f67e9dbc280a80c400e9634a4575e
Merge branch 'MDL-52333_master' of git://github.com/dmonllao/moodle