Merge branch 'MDL-28490' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 09:55:21 +0000 (17:55 +0800)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Tue, 2 Aug 2011 09:55:21 +0000 (17:55 +0800)
commit44506b87dc427eadb0456dd603574bd82ced0888
tree7114bc9e6e2190cac035ca8b70157f45465bf86a
parent58e67f7f1a36d5a0bc6292f19b1f23ae71efaec3
parent2f1ba2aed70ef1e849a42e4455277d6aa4b770c6
Merge branch 'MDL-28490' of git://github.com/timhunt/moodle