Merge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Apr 2014 06:09:15 +0000 (14:09 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Apr 2014 06:09:15 +0000 (14:09 +0800)
commitc8d940a5a64a8eeafbc479b26f76f10bb80b37f7
treee0ad0bf013c91a368c8ddd6505c744d0b00e9595
parent5f5d4e9e69c85171790240de8849c6db0d4102ee
parent92810c07f7555e24d47f90a52eb1db23ffdaed10
Merge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle