Merge branch 'MDL-30168_tim2' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:15:04 +0000 (11:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:15:04 +0000 (11:15 +1300)
commit221dd28b657ac397d8c72ab8840c1e50f30ffdca
tree2f4d5c46b5273dfaadea7f1b4476364410051b8c
parenta46fe43ba2d43ee579e3e7e31c3ebaec45dc0b6e
parent820b41e34f46c74f9b39d3fe5e26b8a21a3d4668
Merge branch 'MDL-30168_tim2' of git://github.com/timhunt/moodle