Merge branch 'MDL-34702_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:11:07 +0000 (02:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:11:07 +0000 (02:11 +0200)
commit69be24a7760dbecc34a16de45353a8e37eeeb360
treed09c68d35f1a82aafa4ba9935452f0320c89ab0d
parentb74390e38b87250df660cb4f686e2edf12bcae6b
parentd1755c12a07cfc785c8b386677c0efdd2ec3e443
Merge branch 'MDL-34702_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE