Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 26 Nov 2013 23:36:02 +0000 (12:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 26 Nov 2013 23:36:02 +0000 (12:36 +1300)
commit8d5a9d6ec11990536f2478c5e7980fa0d7158452
tree394a2493e4101ee6271b49a960234db3f16faf13
parent51e9d69af2312c812c96931e5aac947e71d10644
parent6f5db6a6a810c275a490a72e3fdf89f90c14d481
Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle