Merge branch 'MDL-38487_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:55:28 +0000 (00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:55:28 +0000 (00:55 +0200)
commit7f8cc6f777ff9dc351c07946b00186e95898da22
tree4e301ac24069b5acaee6a292c18f5689736aaa1f
parentce3fa5931dbcb297602b64beb3daf2689e3e7f7c
parentc5602897c16de7d476ae803b8861e5732fbec0b4
Merge branch 'MDL-38487_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE