Merge branch 'MDL-37431_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:16:34 +0000 (00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:16:34 +0000 (00:16 +0100)
commit8784a3b2a2d1b638087b0f50b43ac13bb5915141
tree1800c01ad4a6e2bbade15f006ace79c45595d3fa
parent1ed7c77347c77eef550e5f93e3a49d2b5e56b588
parent3daceb9d5c49c4dbcecce82d4793d8d5d89398ae
Merge branch 'MDL-37431_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE