Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 23:13:34 +0000 (01:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 23:13:34 +0000 (01:13 +0200)
commit0bde123fa80b8f296c95602d4349a9d063025c37
tree7efcd64831e5db0aaa95de873f74c2b5888992b3
parentca2b89d5dfb7e62fb7be797ac7bde2d794fdf752
parentcab2c7ea6eb1852e7c187e67388434436356fddf
Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle