Merge branch 'MDL-28055' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:02:51 +0000 (00:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:02:51 +0000 (00:02 +0200)
commit497ad94adbdaca0279391515940463b8e39e8897
tree5c6ac37e7687dc1706029ac9e3911c743fdc81a7
parentf684dce0139afcc553257b5958ada15acbace14d
parent8818c826ea40aab9373284bcbc127948598b2242
Merge branch 'MDL-28055' of git://github.com/timhunt/moodle