Merge branch 'MDL-30532' of git://github.com/timhunt/moodle
commit6508fbc37d19bf5017d720f760aa4ed5bbcf757d
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:15:27 +0000 (13 11:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:15:27 +0000 (13 11:15 +1300)
tree9910bcf35863a5176f43d72d55bfb2cf27ad1fb8
parentde3e5df24f80f58c5251b1bafbbd26f2e30ec115
parent8a058b758c0343f52c0c4904ed060e6ddf3eaa06
Merge branch 'MDL-30532' of git://github.com/timhunt/moodle