Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: fcdc588 6e67d80)

commit	d61d4c1bf692f42e538cb53cb7d2cace7cbc4101
author	Dan Poltawski <dan@moodle.com>
	Thu, 31 Oct 2013 04:14:50 +0000 (31 12:14 +0800)
committer	Sam Hemelryk <sam@moodle.com>
	Fri, 1 Nov 2013 00:57:33 +0000 (1 08:57 +0800)
tree	b0ad97510eaa46f4759e1bc623f99213c4d301e4	tree \| snapshot (tar.gz zip)
parent	fcdc58897600b10b93a89917b7ba9b95c75ab7b5	commit \| diff
parent	6e67d80d50f017e70022e0393a2f3c2e8a655522	commit \| diff

Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle

Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js

mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js	diff1 \|	diff2 \|	blob \| history
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js	diff1 \|	diff2 \|	blob \| history
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS