Public Git Hosting - moodle.git/commit

commit	a07b82a9bb4ca9cb3c512e18a78f68afbb4ad2b0
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 5 Jun 2013 08:45:19 +0000 (5 10:45 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 5 Jun 2013 08:45:19 +0000 (5 10:45 +0200)
tree	ecf4bf8c4f2425fea0bb60b391ba1f6243a9c01f	tree \| snapshot (tar.gz zip)
parent	330ae1764f9cc49b4ed7e81e67b8fc0ad72098a8	commit \| diff
parent	a6ce14dfb5644041a4bb83306cbe1018d24b6a61	commit \| diff

Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

Conflicts:
index.php