Merge branch 'MDL-26537-flickr-callback-url' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 15:23:08 +0000 (16:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 15:23:08 +0000 (16:23 +0100)

Trivial merge