Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b5fd249 db0f009)

commit	a59a423926c0688954ecc6e70e011179ce430438
author	Sam Hemelryk <sam@moodle.com>
	Mon, 2 Dec 2013 22:12:34 +0000 (3 11:12 +1300)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 2 Dec 2013 22:12:34 +0000 (3 11:12 +1300)
tree	8a840597298c9383e64052cbb3981dc3a98d053e	tree \| snapshot (tar.gz zip)
parent	b5fd2497d66eab81293067002c3366d74ca7f347	commit \| diff
parent	db0f0097e802db3549a891473ecd0d5e2df7c3de	commit \| diff

Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle

13 files changed:

admin/tool/uploaduser/index.php	diff1 \|	diff2 \|	blob \| history
backup/util/progress/core_backup_progress.class.php	diff1 \|	diff2 \|	blob \| history
blocks/rss_client/block_rss_client.php	diff1 \|	diff2 \|	blob \| history
course/tests/courselib_test.php	diff1 \|	diff2 \|	blob \| history
lang/en/admin.php	diff1 \|	diff2 \|	blob \| history
lib/badgeslib.php	diff1 \|	diff2 \|	blob \| history
lib/classes/session/manager.php	diff1 \|	diff2 \|	blob \| history
lib/filelib.php	diff1 \|	diff2 \|	blob \| history
lib/modinfolib.php	diff1 \|	diff2 \|	blob \| history
lib/upgradelib.php	diff1 \|	diff2 \|	blob \| history
mod/forum/lib.php	diff1 \|	diff2 \|	blob \| history
mod/quiz/report/overview/report.php	diff1 \|	diff2 \|	blob \| history
question/classes/statistics/questions/calculator.php	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS