Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 20:13:05 +0000 (09:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 20:13:05 +0000 (09:13 +1300)
commita92617fa3f7c33e8b7914dd1792781e322470d5b
treec4742ab6a3e5baa9ba1198fa5c82f2425a1e65ab
parent6ac16bb9811a68a2047b2124817f4e5a3f47ff68
parentaf4d19abfb9c40eb3b6a44c80ce28149d56d4993
Merge branch 'MDL-43410-master' of git://github.com/andrewnicols/moodle