Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle
commit25c94edb27da9e3a18ff0b842c79f160e1ab87d2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2012 01:01:30 +0000 (19 03:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2012 01:01:30 +0000 (19 03:01 +0200)
tree1db67f37cf960928065e08ba3448f4bdc35a9333
parentf98973c2ff4df54343b27086470985eb6a83eeaf
parent8b5039361a8cd5228da444f6970c997ee4689451
Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle
portfolio/googledocs/lib.php
portfolio/picasa/lib.php