Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle
commit117111b78b6c4b5969ac15e3f5fb8dd7ce98d4ee
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:54:02 +0000 (9 16:54 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:54:02 +0000 (9 16:54 +0800)
tree034df8f01c203852a55c09795aa79be88cd1c9b5
parent07b0214588ddd0753aeea7c7bda365335196d42f
parent614119163fb56ca016779309d3f6aa35a1f44272
Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle