Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 77218e4 6c0bfb1)

commit	db34f8cbdb530659190353f786c9c0d062b1c2b8
author	Sam Hemelryk <sam@moodle.com>
	Tue, 30 Sep 2014 19:57:37 +0000 (1 08:57 +1300)
committer	Sam Hemelryk <sam@moodle.com>
	Tue, 30 Sep 2014 19:57:37 +0000 (1 08:57 +1300)
tree	3da5e2587d0c4bb156490b41617b6b89a9cb7626	tree \| snapshot (tar.gz zip)
parent	77218e4a52871e45c2c2ac26d140cebd876f651a	commit \| diff
parent	6c0bfb1449e9a477e417487ec1378cb314c46d52	commit \| diff

Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle

Conflicts:
version.php

lib/db/upgrade.php	diff1 \|	diff2 \|	blob \| history
version.php	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS