Merge branch 'MDL-42240' of git://github.com/danpoltawski/moodle
commit77631383f0c29c70bb4c8deefada8034a62bec00
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 23:04:36 +0000 (16 01:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 23:04:36 +0000 (16 01:04 +0200)
tree1b1991b3cb57e4e5561780f61f34de23eb04c12f
parentcbef1d9d3f5e0f9c1fb57a1e37a76dfc51822a57
parent9092378ddbd1aa07aacd17fe52589a04a079dfe2
Merge branch 'MDL-42240' of git://github.com/danpoltawski/moodle