Merge branch 's10_MDL-27341_flickr_json_error_master' of git://github.com/dongsheng...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 01:06:14 +0000 (03:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 01:06:14 +0000 (03:06 +0200)
commit1e3ddd6bc41af3dbd082b4a811df4f62cec2c678
tree7d03cecd83f066446bbc0113513a181fb3db5568
parent92f753eb99b17840ddbfb3d7ebbb66c53ce2eca3
parentda78b10ce0ff1104c3ce2dff6fd63bce0f166042
Merge branch 's10_MDL-27341_flickr_json_error_master' of git://github.com/dongsheng/moodle