Merge branch 'wip-MDL-29006-m20' of git://github.com/samhemelryk/moodle into MOODLE_2...
commit029a753b91511ae8acc414052b23e535aa7284cd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2011 22:38:55 +0000 (6 00:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2011 22:38:55 +0000 (6 00:38 +0200)
tree87c6dd2162e73410a8362a683db2c0a666cb3b8b
parentcba00bdb69ecc044e9aa9153bd6e007f9a899962
parent8068301cd7edd2ab2aed5ec5c46881c27d82111e
Merge branch 'wip-MDL-29006-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE