Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:17:00 +0000 (11:17 +1300)
commitec998f7487f8a82ca6119da136013becc1b73969
tree1542a1cfb59071a3eccc7b298cde80cf28ba6c4d
parent18f179751749578199d556a847085e19243c4ec1
parent6fa877e24382cb44dfe25fd3edc1896367d6eb77
Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle