Merge branch 'MDL-52383'
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:26:22 +0000 (01:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:26:22 +0000 (01:26 +0100)
commit4b2326faad25ce22d1d508faee3a907022902eb5
tree97c75699bed93ede1eaab94fa3e23b6b43d388d4
parent6f85e729e3ab2fcd84aa2dcfa33cf4329c791fb6
parentd3220ca34f9ec363502ad39d340f2e57d4090901
Merge branch 'MDL-52383'