Merge branch 'm20_MDL-28971' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit14f9c0cbcd99fd3cfada8dd2c2fd393b919dec42
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Aug 2011 23:43:05 +0000 (18 01:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Aug 2011 23:43:05 +0000 (18 01:43 +0200)
treedbd6d520b61796112fcbabdcd10ce50fff7a9670
parentc7cce21d67f2ac392759c1144f3058930bdbc62a
parentc9a08027944345b2cca05d625f273d2fa394b3f9
Merge branch 'm20_MDL-28971' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE