Merge branch 'MDL-30741_m20' of git://github.com/jfilip/moodle into MOODLE_20_STABLE
commit9f78a33c7b9dc08271bf0f9401ad1b9df2cf5bd1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2011 23:05:59 +0000 (20 00:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2011 23:05:59 +0000 (20 00:05 +0100)
treee339eac41df82b644e84f4d4c8c360a67ebbd721
parentffcc16f52a23be39661af96c75ea495a763d25e3
parentc40e59f1c6429672008f12b78ee2c8bea931ac30
Merge branch 'MDL-30741_m20' of git://github.com/jfilip/moodle into MOODLE_20_STABLE