Merge branch 'MDL-45041' of git://github.com/jleyva/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Jul 2014 03:47:13 +0000 (15:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Jul 2014 03:47:13 +0000 (15:47 +1200)
commit6239a2358fe4ad5842dfbc9248933b73465ebe40
tree69ee241c955eb1fa54e24645051b4bf4841d748c
parentfe5bf6ee81ad7f48180c1ad31d24160d979b3a12
parenta1bacaf13d6575d2a6b8293f73983161fea99d4d
Merge branch 'MDL-45041' of git://github.com/jleyva/moodle