Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 21:27:45 +0000 (10:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 21:27:45 +0000 (10:27 +1300)
commitfd0281dfc3461cb23580eda9ecb8d7364044a987
tree4d3576e0b447fc942b5daf4b22023130d5e9c357
parenta88c1ca91a4112b9141e48ac6629d896ec2db65c
parent54d076a353d2570c466116b6cfbcbd34c9ab55f3
Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle