Merge branch 'MDL-48639_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commit96c43159319e033de4594ea02f5ab7103d52c9a3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Dec 2014 18:10:01 +0000 (22 19:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Dec 2014 18:10:01 +0000 (22 19:10 +0100)
tree310234de252ef49c1f450d4b4f873af5f2b8c46e
parentd1da63854080ac78b13b9c221e327f04dd4139c2
parent47f7c656baea9c43f481411805370a337ebdb15e
Merge branch 'MDL-48639_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE