Merge branch 'MDL-31196' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 11:16:42 +0000 (12:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 11:16:42 +0000 (12:16 +0100)
commitb3bc81893ef057e10967fe84008d7293083ff3aa
tree67ba5932cae28e24b199c8df4710f354f24eefb5
parentd36b5d1177e824f18331507d66a9e34154e25816
parent273a432956283cec3927ee6f1c7e59aa69f73dd0
Merge branch 'MDL-31196' of git://github.com/stronk7/moodle