Merge branch 'wip-MDL-27400-master' of git://github.com/samhemelryk/moodle
commit91a7cd842dd6347004f092e8881933c2ef0ed76c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 May 2011 00:04:34 +0000 (9 02:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 May 2011 00:04:34 +0000 (9 02:04 +0200)
tree4d30983357d383a5c06930a29fc524f35c31a23c
parenta8f60a4d586477f172f266831d418ec8b19740f6
parentfaca4f2f295fc366f07248f36ae357f1de463f97
Merge branch 'wip-MDL-27400-master' of git://github.com/samhemelryk/moodle