Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 18 Nov 2013 21:15:33 +0000 (10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 18 Nov 2013 21:15:33 +0000 (10:15 +1300)
commit1098226524271901dc9051406cd2b650ce121e05
treea4ff8d069238d6460ee72b6b9877580b1ecfacf7
parent34592ffd98e998d8544b4624b40dd60e52e3008c
parent1f802c17c022a649e5fa51ce903240de61d15f09
Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle