Merge branch 'MDL-52260-master-2' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 02:01:44 +0000 (10:01 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:16:33 +0000 (11:16 +0100)
commit38e0faafc2d46f155460fb78f01a367a3bf019cf
treea2e6c11667c436e4dff5c696878c0eeef156a818
parent40cd9f9ac9fd4ff0f227c24b08c6b15a25911fc7
parent956caef6ad8142393b4beb83eeeede5402f8abf2
Merge branch 'MDL-52260-master-2' of git://github.com/xow/moodle