Merge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle
commit032bfca82a871266a620046e7eb0b799856e4ee8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:42:40 +0000 (11 02:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:42:40 +0000 (11 02:42 +0100)
tree1322f186c35555d91678630802d4985c735fd386
parent509361cfde22184d11160e90c73e0a23c0e45117
parentef6b3ba159f3a746008ce601a15fbaac3b434cd5
Merge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle