Merge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:56:05 +0000 (13:56 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:56:05 +0000 (13:56 +1200)
commitda8cd86f173a7487b1e8d5f89cd48d3b799f34f7
tree43b71b48c011fc633613d36eb609127189f8f6b2
parentefc2c5171280df1f463f40193d90bf18001d7927
parent137885b7e9d90d8709ade3c727f6f08631bd8966
Merge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle

Conflicts:
lib/upgrade.txt
lib/filelib.php
lib/upgrade.txt