Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8225883 4267fc5)

commit	d5e6fe3ecc99321f743be2d62a9acf888a9130f4
author	Sam Hemelryk <sam@moodle.com>
	Fri, 18 May 2012 04:07:20 +0000 (18 16:07 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Fri, 18 May 2012 04:07:20 +0000 (18 16:07 +1200)
tree	d02bfbdf14beff34e845f896104b679ac6eb34e8	tree \| snapshot (tar.gz zip)
parent	82258830b7742808e702100a29956ccb13ad772b	commit \| diff
parent	4267fc52720d4c421e2f90c28bf38812ab2784e7	commit \| diff

Merge branch 'MDL-32727' of git://github.com/timhunt/moodle

Conflicts:
mod/quiz/db/upgrade.php

mod/quiz/db/upgrade.php

diff1 |

diff2 |

Read-only mirror of the Moodle CVS