Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 21:57:29 +0000 (10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 21:57:29 +0000 (10:57 +1300)
commit6067a4c87c4a579b354fcfabc988e6d59071066e
treeac2592b236ffe9b8bd7f201e97fc8e2a981a9072
parent06404b01180a2965804fab9e47715fdc2b6bdfb4
parent35e7ad6a60c4251ec263872018f8a05e296f0740
Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle