Merge branch 'MDL-48860_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commitb70a4b3e6176a8c511d0d00282957f3c0a2dc932
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 16:47:24 +0000 (20 17:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 16:47:24 +0000 (20 17:47 +0100)
treee648abeac83b79e171a6d90076b83a09c4c186ee
parent85ea64f5ee7812fae1427c3c15f1472bc0114daf
parentda36d32ef79edba957e564f6304fbb553c084b31
Merge branch 'MDL-48860_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE