Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:00:20 +0000 (11:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:00:20 +0000 (11:00 +1200)
commit4744851197f5e39eadb2cb803261b4edc5f51d55
treec98b47a0f60821b792c5cd30f7f13341357fcb8e
parentca774c940ecb99225d65c39995d080c84554b4a9
parent775fe70093a6ff0cc8b7d7b6287c1014b30f16f6
Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle