Merge branch 'MDL-38885-22-int' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit86a8b476d4b105e329626c54043ba707c122d591
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 01:18:39 +0000 (10 03:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 01:18:39 +0000 (10 03:18 +0200)
treede21738f4162fac59d693a201540cf5b183319fa
parenta811e8ac56e49a174b68ceade81197c80be4b325
parente8ca6884531a3162cf755d7c09c29e7933c84090
Merge branch 'MDL-38885-22-int' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE