Merge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 21:27:46 +0000 (10:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 21:27:46 +0000 (10:27 +1300)
commit3ea5ff8941468f9b92e0c02caf06b7db2632e69c
tree0650ae76b736f8ed3e3baf8ca7ced48f8efeddc6
parentfca969b9bb4d264956e9704c7b4dc054b492f481
parenta09a837f20e2e09a19c8120bf71bac794ee68ae6
Merge branch 'MDL-42875_master' of https://github.com/crazyserver/moodle