Merge branch 'wip-MDL-27809-master-r7' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2011 08:11:02 +0000 (10:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2011 08:11:02 +0000 (10:11 +0200)
commitf83776f2ec4541fa6e132d63a24e45675e06a291
tree64bc3a9f590448f1a88a726d2ed4be5e993631ae
parent29e2d0a820f2f4cf3286843177d79544ca45eb1d
parent3992a46e894890ade8a6b959ad3ec4bcce42b695
Merge branch 'wip-MDL-27809-master-r7' of git://github.com/samhemelryk/moodle