Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 19:47:14 +0000 (21:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 19:47:14 +0000 (21:47 +0200)
commit080f585f3924a82e56322570694a0dadfaec2aca
tree55464e7cc85205ba93ec62aafa1727756728f7b5
parent0b702fca0b1d43f1adac4c8fdfb885e4ed4051b5
parent7b61ac39d2674f3ce9f7a5dadc4ea85d7ded8f50
Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle