Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 22:37:23 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 22:37:23 +0000 (00:37 +0200)
commitc380fbf4c9f76b29fcfbd766b72b5ad50053b978
treedb3e65da051bb8e7c7a11043585cf8fb549f5b16
parent8f85249a9642eb5dd571f4a2e52e46bc161b7a78
parent7441c53cc11766d79d6567aee3deb2a286faf342
Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle