Merge branch 'MDL-43930-master-fix1' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:13:23 +0000 (14:13 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:13:23 +0000 (14:13 +0800)
commit08b47e61785a44823952dfd1a6bcda3fe1136648
treee90a6c123f97cbed4a7cb07883e367f85b8ab5a1
parent0cc30f6fcf8a9d3d2ef22e9e6f2d11e3004808a0
parent67eb36413aa528ee85af7aebceb64e1b0dc2c0ad
Merge branch 'MDL-43930-master-fix1' of git://github.com/damyon/moodle