Merge branch 'MDL-31324' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 05:13:10 +0000 (13:13 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 05:13:10 +0000 (13:13 +0800)
commit8ce97182396873ea8eb7b1bffa0c330fb76dcca7
tree9127ec8a1dfb2f372502336d9800520c8642d87a
parent1a20b3494b84f8bddd713b6f7bb8b1c94d7d4f06
parent8f45b696926ca2e55e17486e3b6869f5fd0097e4
Merge branch 'MDL-31324' of git://github.com/lazydaisy/moodle