Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: afb5f28 dd8e6cd)

commit	5fb9161b5e66438ce5ed18226a2fb3462e1baa81
author	Damyon Wiese <damyon@moodle.com>
	Tue, 29 Oct 2013 05:57:51 +0000 (29 13:57 +0800)
committer	Damyon Wiese <damyon@moodle.com>
	Tue, 29 Oct 2013 05:57:51 +0000 (29 13:57 +0800)
tree	ffef806d8cfa120f5510303a907d640310fe70ea	tree \| snapshot (tar.gz zip)
parent	afb5f285cdae8c1fa408b7d707cd59f0693f8e8d	commit \| diff
parent	dd8e6cd932009cef9d157ea88012a16068ed253e	commit \| diff

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

Conflicts:
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js

Read-only mirror of the Moodle CVS