Merge branch 'MDL-30868' of git://github.com/lazydaisy/moodle
commitfe4abbe1800eb8fb39791b293106b477c89b493d
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:38:04 +0000 (3 10:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:38:04 +0000 (3 10:38 +1300)
tree82436bcbbfc79f78063374c77041de79826bb558
parente525c992ca862cd5bc67086c4122563ab28d27bf
parent9bb15cf95608b2f301e6001a4cdd912bca2898a5
Merge branch 'MDL-30868' of git://github.com/lazydaisy/moodle