Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 05:00:29 +0000 (13:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 05:00:29 +0000 (13:00 +0800)
commit61e1d3d96c347b62b260c4267558111c3dc0a752
tree2fbe5500b700b8ea4cd3857e5d0dbaf8be1be55c
parentf3ba5f4249048ef3eb02a41da0c798278e72fb75
parent40d56513024a800f8bce2e93af870635b350cf76
Merge branch 'MDL-53883_master' of git://github.com/markn86/moodle