Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:45:19 +0000 (10:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:45:19 +0000 (10:45 +0200)
commita07b82a9bb4ca9cb3c512e18a78f68afbb4ad2b0
treeecf4bf8c4f2425fea0bb60b391ba1f6243a9c01f
parent330ae1764f9cc49b4ed7e81e67b8fc0ad72098a8
parenta6ce14dfb5644041a4bb83306cbe1018d24b6a61
Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

Conflicts:
index.php