Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 23:42:29 +0000 (11:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 23:42:29 +0000 (11:42 +1200)
commit3fb4d8fa8836ba4dd5d4442eb549e5a9dd7eb112
tree972480511eecd5c8a836bad85777d6433f20e8be
parent2e718bc4bdbaf84a7c7dc9db8d47a9ccb2b86298
parent907a6737fce254f4af5f398784c4d0c150790a01
Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle