Merge branch 'MDL-42626-master' of git://github.com/jleyva/moodle
commit80692b4b681def419a65d5e8ea0945ce5377bbae
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 02:07:40 +0000 (4 10:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 02:07:40 +0000 (4 10:07 +0800)
treeae0a5e9a31ec6181e93faabaecff44ae58eb6ca1
parentfec495980947c7de165b054a6e453a5afc2f2bbf
parent013937907f35a8394923116f2fd12509ac0068cd
Merge branch 'MDL-42626-master' of git://github.com/jleyva/moodle