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)
commitec58c9ddf01e03b1dc9f61d820324b3cdfaa10c3
treef078e6dc593b6cc85514f874c9e9981d2dac0c54
parent5df4d6ccab0fe0ba327c1dd510f379ced1507752
parentdd2645d3049eb0f02409c6e2379d10a2c9864823
Merge branch 'MDL-26537-flickr-callback-url' of git://github.com/mudrd8mz/moodle