Merge branch 'MDL-28103' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 20:17:16 +0000 (22:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 20:17:16 +0000 (22:17 +0200)
commit0e2901443c29ee28577afe5880aab31be402b58b
tree9b2c3f561e1a57708d065c9a9a3ff03a1276b58c
parent715a5bb732b6d8c5875464ffd3b80c4ece5c5b0a
parentaa5257ce7eca9a6b6693fb94a58441f513de137c
Merge branch 'MDL-28103' of git://github.com/timhunt/moodle