Merge branch 'MDL-39723-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_...
commit8c8b3eba2479e99a69a07ca77487d5954584dd49
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jun 2013 15:48:57 +0000 (4 17:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jun 2013 15:48:57 +0000 (4 17:48 +0200)
treea9ad8a685692ded39cea03f7067878f4825eba33
parentbf2360c59733025daab84ad762494160ec4d27fe
parent695f6f3c232c2a01c16a978b57be20c6fb8afbf7
Merge branch 'MDL-39723-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE