Merge branch 'wip-MDL-23787-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 00:22:54 +0000 (01:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 00:22:54 +0000 (01:22 +0100)
commit8650e13f9b0b6377310232c597acbea4a4aa0ec4
tree84edd31a3f4023b430d8c47400fadb231401349a
parentbb77ead0a455404b35d354970c26dcd99972524c
parent292077063e66d727d432c0e3cc21f344a3b1e8c8
Merge branch 'wip-MDL-23787-master' of git://github.com/marinaglancy/moodle