Merge branch 'MDL-29668' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:09:34 +0000 (12:09 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:09:34 +0000 (12:09 +1300)
commit77b93da537e86a7001c8f4d6e09172439bd936cf
tree0691d3de008ded383b0049b999b584d0c617aae3
parent36a42c57d103856ea7fabd291137f540674b86f8
parent617a9bb4c31598531728336a102d3c39b626221d
Merge branch 'MDL-29668' of git://github.com/stronk7/moodle