Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 00:02:24 +0000 (02:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 00:02:24 +0000 (02:02 +0200)
1  2 
repository/flickr_public/lib.php

Simple merge