Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 19:56:27 +0000 (08:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 19:56:27 +0000 (08:56 +1300)
commit55dc0eb979ea4f7796c65b55d5e690bc89addb53
tree8a25ae964b11141ba3fce59c430918fe6132c5c1
parent0b861e92d0fca3b93a5dc715dd9314bb5e8d09c8
parentd8389cd6f83087ec5d9dfc43a538a515b63f5777
Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle