Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 68a6d3c f3aadb1)

commit	75fb3832604a33974afb0c77dab865ff71ede99b
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 3 Apr 2013 22:51:47 +0000 (4 00:51 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 3 Apr 2013 22:51:47 +0000 (4 00:51 +0200)
tree	8c7ec3a95b95f661486bfc145c97d0fcd588f48e	tree \| snapshot (tar.gz zip)
parent	68a6d3cd9ffbf945d2d0fba542ea55c7b8e7109f	commit \| diff
parent	f3aadb1cd0e397ec8cfbda92c6c54c26713981ad	commit \| diff

Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle

Conflicts:
mod/glossary/mod_form.php

lang/en/moodle.php	diff1 \|	diff2 \|	blob \| history
mod/glossary/mod_form.php	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS