Merge branch 'MDL-40607-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 22:40:57 +0000 (11:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 22:40:57 +0000 (11:40 +1300)
commitecf3b93d3984900743cab2e300a628d18b9561ce
tree5b3d555ab33a3bea611f8c77352a64d3d79c9e01
parent602b281dcb0a515308ffd3266c8d3e54a54a8ddb
parente4d9185e4a53366a2af1ef45f29ee0b111d2e622
Merge branch 'MDL-40607-master' of git://github.com/danpoltawski/moodle