Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 20:34:25 +0000 (09:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 21:34:09 +0000 (10:34 +1300)
commit6d97620481febee35804d37e68b21cc325336f56
tree102201a0f767adbbf76c112881f38d5194bb508d
parentc106341098b28496bb7aca9c4739b2578bf3f7d0
parent68ef378b1bc63dcc04174272fc4cb4df750b8dac
Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle