Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle
commitcb39c6136b862857c8e2310d827355985048379f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 21:29:21 +0000 (27 22:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 21:29:21 +0000 (27 22:29 +0100)
treefa47dbe7acd44c0ca5f1c97a2f0713ef1bbe38db
parentc4b39661b9f704b44fdcc166d9018a44f8352133
parent3756320fd0e318eeb1fcc168687ed86af0ae8d62
Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle