Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 22:15:12 +0000 (11:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 22:15:12 +0000 (11:15 +1300)
commit323ed3bbf0d76378ee3dde683057265593e7bbbf
treeaabe8e668529dea4dcc8787d1f02b38964da2e57
parent3ea5ff8941468f9b92e0c02caf06b7db2632e69c
parent5ea0d026b054ddf71268ecbd2691a3181a487925
Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle