Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 16:45:15 +0000 (16:45 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 16:45:15 +0000 (16:45 +0000)
commit43fcd55e0c81e33fb8ed9ab701d2c719a02250e9
tree0f88a74826061565c295e84e2b0411425681f066
parent2c10892c9e171b2c7843be2db630d256eefd1a4e
parent2bb196ebe367203c8c370171ea744eb7f093c786
Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle