Merge branch 'MDL-34610_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 18:21:55 +0000 (20:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 18:21:55 +0000 (20:21 +0200)
commitb19d21e26bd33aaa6903af9c18a60c46eedf6c33
treeecbeacccd147acdbbf87a20db08d5b5ab98be342
parentc55a7ac5b058ee6655d99a2207ac707a45b4ab58
parent80178c1c9ee17251758f0693513dbc4d3fa39503
Merge branch 'MDL-34610_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE