Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 21:48:36 +0000 (10:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 21:48:36 +0000 (10:48 +1300)
commite2c4c4202ddaf8938f00dc646d7e1e7d1da41625
treec77255741091bb32de516f09927d610a252a89db
parent2f0a996b101b8d0e0cab1acbbd31e90f02abbfb5
parentc528917d3f6e84a132b6eff2bb06a7ed7eb992fa
Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle