Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Mar 2014 01:18:08 +0000 (14:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Mar 2014 01:18:08 +0000 (14:18 +1300)

Trivial merge