Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 234f953 d10e611)

commit	72e2a1d7eb9d8c6922238843fd3daf03d1d3d72d
author	Dan Poltawski <dan@moodle.com>
	Tue, 11 Mar 2014 06:35:51 +0000 (11 14:35 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 11 Mar 2014 06:35:51 +0000 (11 14:35 +0800)
tree	ee59d5810593d759a242faf718bc8a8dd3e6ad65	tree \| snapshot (tar.gz zip)
parent	234f953c440f53b85a4147df8cd36a628390fab6	commit \| diff
parent	d10e6118761102bd58da47722157d401f4f21974	commit \| diff

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

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

Read-only mirror of the Moodle CVS