Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 21:42:35 +0000 (09:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 21:42:35 +0000 (09:42 +1200)
commit207891d791913d11489d7b8f3e8cfa89a9164f49
tree3bd6651a2bbf25b786caf99cf6cbeb033ba81192
parenta02656b75a7b77b72a5dbfbcf7812750c7e22790
parenteeb9ee8ebf71c10b0a9fdeac07cc8c4fafbc1f01
Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle