Merge branch 'MDL-30646' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Dec 2011 00:23:45 +0000 (13:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Dec 2011 00:23:45 +0000 (13:23 +1300)
commiteae0b9a9e3c72456f795c7b51deaac5f3f68c79c
tree5beee0739466d18388b94701d71c54ae02340e3f
parent22c3690b9d5c39130affc04555dbe25dec5adf5c
parent29ded2d68a9e93e258bcd6276dbb6d770f976471
Merge branch 'MDL-30646' of git://github.com/timhunt/moodle