Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8ec7c2c 5720019)

commit	1c0441bd6a770ef29ee24f984006cc41bf7c8a7d
author	Sam Hemelryk <sam@moodle.com>
	Mon, 14 May 2012 01:39:55 +0000 (14 13:39 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 14 May 2012 01:39:55 +0000 (14 13:39 +1200)
tree	166d94a6adc1b57ab1d39c1c3304ad8260162f80	tree \| snapshot (tar.gz zip)
parent	8ec7c2cfd98c55d9733ee8929148e199fa7b54ba	commit \| diff
parent	5720019d911450244401c50829fdddb4c76cf12a	commit \| diff

Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle

Conflicts:
course/lib.php

diff1 |

diff2 |

Read-only mirror of the Moodle CVS