Merge branch 'MDL-36570' of git://github.com/colchambers/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2013 14:59:34 +0000 (16:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2013 14:59:34 +0000 (16:59 +0200)
commitc001c51a2634b0334d2d392437ab48a827f2bd49
tree2b30c79545693c8de4a57d2c2eb64c934ed8b91c
parentc7fbfe46f91e3bb0f71c7b224ef9571e48a5a90a
parent11a66e2c5a26029454a0cb6b1393ae35b6c17656
Merge branch 'MDL-36570' of git://github.com/colchambers/moodle