Merge branch 'MDL-56182-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 08:26:38 +0000 (08:26 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 08:26:38 +0000 (08:26 +0000)
commit19d8b0f9e180cfc0466c3d0dd2705acce5b4fd8c
tree1fea339240a293e6dd68065758e369f648166c04
parenta954685767ca70d730bdf370b00ee82056a2da08
parent6b7e523b5d3d8ea5d35cdbd70f7863d5b8ecfaf8
Merge branch 'MDL-56182-master' of git://github.com/FMCorz/moodle