Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:58:04 +0000 (16:58 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 08:58:04 +0000 (16:58 +0800)
commitdd6279788dadaa6097319fbe235344a3a55b10c4
treed6b015f2ec39cf07bcb2f5b53c48574a3d2a05f8
parent89d91403f9b4d2f0ca19e5e4f9c6d4e5631d7bb3
parentc5f0d9f50adc8cee2ea6d7f5a795ddf47a108054
Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle