Merge branch 'MDL-46509' of https://github.com/danielneis/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Aug 2014 03:45:43 +0000 (11:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Aug 2014 03:45:43 +0000 (11:45 +0800)
commita564a66efa47b6ca7025a917cfaeb8f65a81479c
tree723203ac10cf9207c7d69ffc8325d398c994ef17
parentab38cb28330492d82e833960ba940cf80ab13a87
parentb5a289c4e8b261187f75a49fccc243c968bca94e
Merge branch 'MDL-46509' of https://github.com/danielneis/moodle