Merge branch 'wip-MDL-27962-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:02:20 +0000 (00:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:02:20 +0000 (00:02 +0200)
commit06c8cef4c2419fd7aaf70ba4f908f76aee43c49e
tree56dea3b6b89873837cd7b4168a3b23983fc5b510
parentfcb36b65ec39d8737da6b49915c076a399fd29e6
parent8b05c5e2bda910688dd647a096df8f6b91c8ff76
Merge branch 'wip-MDL-27962-master' of git://github.com/samhemelryk/moodle