Merge branch 'MDL-47893-master-fix' of https://github.com/zbdd/moodle
commitb729370ebedaefad091730c10d6879a2430de055
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 07:22:55 +0000 (5 15:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 07:22:55 +0000 (5 15:22 +0800)
tree8daf42c365486d92bb2e8b04d85d45cc4f0cdd8e
parent086e5b7b9eaefd04a91f55679423baf6ed850855
parent4fb6b62c4285736bf0b3a6e363bb8880f6c94ab4
Merge branch 'MDL-47893-master-fix' of https://github.com/zbdd/moodle