Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle