Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 03:31:07 +0000 (11:31 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 03:31:07 +0000 (11:31 +0800)
commit28d72ad973c85ad0e70968e54e4b54db8f408ff6
tree146f848ac6f17610db4ee830d68e4e322f8295ba
parent8450149249a3288e583a8ee6459855e0911df0b5
parent58b1904fd14377c8e017cc4d0cb86325049ec9a5
Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/db/upgrade.php
version.php
lib/db/upgrade.php
lib/filelib.php
version.php