Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 0adadbf 5e543b4)

commit	e5d3f6ea262f835fa4c29e5394c8f0f0e3c13eb4
author	Dan Poltawski <dan@moodle.com>
	Thu, 10 Apr 2014 06:51:42 +0000 (10 14:51 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Thu, 10 Apr 2014 06:51:42 +0000 (10 14:51 +0800)
tree	59e0f29a62b1a2565f33c9bc5ed6ebe645f4d357	tree \| snapshot (tar.gz zip)
parent	0adadbf00bcc9c9f7e2b90730ac766c936c4243a	commit \| diff
parent	5e543b4f7671545cb8e489e48282255bdc329465	commit \| diff

Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

Read-only mirror of the Moodle CVS