Merge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle
commit680d9052ad7a2c90e6ba03c8efc2ec51f7b51e78
authorDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 07:55:52 +0000 (24 15:55 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 07:55:52 +0000 (24 15:55 +0800)
tree5243de077a19c8bef8caffdfd6dbf85abff65a5c
parent012b0472c5f5e21dbaaa5baf6cfb7ff5c60596bd
parent37008335c0fc2650fedeb1f40be6cfe2a45b10a0
Merge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle