Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 454db7d 7b2a5e5)

commit	e6496624896bd2ddf661b398b76c28f14b3bc4e9
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 13 Mar 2014 17:32:41 +0000 (13 18:32 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 13 Mar 2014 17:32:41 +0000 (13 18:32 +0100)
tree	3f9859fbb9b9d35c431d0bfad264881019bf560c	tree \| snapshot (tar.gz zip)
parent	454db7d467fa9c2f9ccc8340ebbf086dae1d23c3	commit \| diff
parent	7b2a5e566369b691fceca6b3f8aaaa508c61a0d4	commit \| diff

Merge branch 'MDL-44534' of git://github.com/timhunt/moodle

Conflicts:
question/tests/behat/copy_questions.feature

question/tests/behat/copy_questions.feature	diff1 \|	diff2 \|	blob \| history
question/tests/behat/edit_questions.feature	diff1 \|	diff2 \|	blob \| history
question/tests/behat/question_categories.feature	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS