Merge branch 'MDL-22236-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 00:11:07 +0000 (12:11 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 00:11:07 +0000 (12:11 +1200)
commit8b7378cff02d6a9717f54bb57691db8cb2e957ae
treee83ef98e0197fd45b74c543987ad28914c7cf0b2
parent61bec33f53704994cb750d65ba48ebf0bc381418
parent1495f2893ece5b3088d97c6d3bd577e7ad0cc011
Merge branch 'MDL-22236-master' of git://github.com/damyon/moodle

Conflicts:
version.php
files/externallib.php
lib/db/upgrade.php
version.php