Merge branch 'MDL-29558' of git://github.com/jamiepratt/moodle
commit9ea1b97fa424c4e5bfd307efcd8c2f9abb932955
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 01:01:48 +0000 (3 14:01 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 01:01:48 +0000 (3 14:01 +1300)
tree649a0e74bd9188e48fc1d0f8206e62eb57b390f8
parentef6380f0429d24f0d314592b991a1ecf132b1ab8
parent76e6cf5d84f25001d74dd35d62d5376b22676e11
Merge branch 'MDL-29558' of git://github.com/jamiepratt/moodle