Merge branch 'MDL-43892_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit8aaf8591f1e834f50ac9229bddbac1bb351ea398
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 21:57:32 +0000 (4 10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 21:57:32 +0000 (4 10:57 +1300)
treeba01100554b03510c8756eeef4a704152f733d6b
parent23ca363633cd37471011ae246d4e45479f26323e
parent6062fc2a5020fb2bbcb38c4d44a3467712f5161d
Merge branch 'MDL-43892_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE