Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 20:30:39 +0000 (09:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 20:30:39 +0000 (09:30 +1300)

Trivial merge