Merge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 01:00:42 +0000 (03:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 01:00:42 +0000 (03:00 +0200)
commit907cc4ceb7369ffdf9708d6e366485f954c46031
tree57e2cd5a8f645614c2b77e56bf0f54781a602d9c
parent627e4bd4a760ad3fcdce7cc6345f32b593b369c4
parentd9306a9c1fb9cd629e9407f92991d0fc58879baf
Merge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle