Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 21:49:03 +0000 (09:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 21:49:03 +0000 (09:49 +1200)
commit3e2af223273fcd008a136c15a587475f5b04081b
tree8da122e3014b05061389ce5acad0ac6a62b0519e
parent6188c8ebab67dc6faafb0608f7e7d1dc67fac4a5
parentfeff774adb0b9b216f3bd394956b205bca36f4b7
Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle