Merge branch 'MDL-34306' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 18:06:19 +0000 (20:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 18:06:19 +0000 (20:06 +0200)
commit7b0c1bf02ae235c949075fd75ddba77727bbff28
treef78315c255d5cab62eac1627dccf82d218732e7f
parentf599c815973ef54e67b87b07736f8bb880171ac4
parent19de315e839fb2f99166300881314d79ab8beff2
Merge branch 'MDL-34306' of git://github.com/timhunt/moodle