Merge branch 'MDL-16474-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 20:29:45 +0000 (08:29 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 20:29:45 +0000 (08:29 +1200)
commit744c77c0578d1c68fd82c290f677ecf74866e348
tree22f0f90b09ec567f46bdac3d777dc73bc7f6f3d8
parent005402f503c7080235b04a9f4d95864483b447f6
parent3774d40f8c9e8bd6688964e0634cfa17dea3c75d
Merge branch 'MDL-16474-master' of git://github.com/FMCorz/moodle