From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Thu, 23 Jun 2011 00:02:24 +0000 (+0200)
Subject: Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle
X-Git-Tag: v2.1.0~86
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=39354db055226b4451b99cf0dd808732c30f4c18

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

39354db055226b4451b99cf0dd808732c30f4c18