Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 05:54:52 +0000 (13:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 05:54:52 +0000 (13:54 +0800)
commitd0231ac9a9744f887928c76318283f0d543dd0f1
tree830a90aa22b9c9b94e7dff200683228470d6984a
parent1ec8da670689e135d5cef360f6d5ccaf8344392a
parent3425813fc4a61cf3513ddc29be391413d4900f70
Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle

Conflicts:
    version.php
    repository/googledocs/version.php
lib/filelib.php
repository/googledocs/version.php
version.php