Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:36:28 +0000 (02:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:36:28 +0000 (02:36 +0200)
commit627e4bd4a760ad3fcdce7cc6345f32b593b369c4
tree466f9f56115be613b21b3bcfba86316e0b40b8c9
parent6eb2cf62bd17fb0bcfdbf4d1484a2765d0d14db9
parentca4eda13b5c11fc15f8a0075a6703741fcaacd8d
Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle