Merge branch 'MDL-52185-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE
commit3439a8196e05dd59a5bff9d46d42cb4b176f1a23
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:27:09 +0000 (23 19:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:27:09 +0000 (23 19:27 +0100)
tree12ce0af58e06d67ab970692abfa809713c211164
parent165d174c7f5bef55b17cd97cd58aefb422c9b543
parenta4e43f3d13c5e924b4c073fdc7b095b93eb42fc1
Merge branch 'MDL-52185-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE