Merge branch 'MDL-29064' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 00:52:35 +0000 (02:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 00:52:35 +0000 (02:52 +0200)
commit18c8de5806bb76540000c5ff88981d9916955d55
tree793239b643e2f5424a9165e44db5843af13814d4
parent52d935de274a6c2273de30eadaf7e56aa9a064ea
parentff82d7fd0a84bc2ddb31877da5fd19a5e3d57e8b
Merge branch 'MDL-29064' of git://github.com/timhunt/moodle