revert image helper to older version. fat free web curl based version creates memory exhausted error
anonymize icon href
added delicious bookmarking support
Merge pull request #349 from bbeardsley/delicious

added delicious bookmarking support
Merge pull request #348 from bbeardsley/anonymize_icon_href

anonymize icon href
update README.md
[facebook spouts] Switched to HTTP when HTTPS not available
Update Authentication.php

I've added a SSL proxy check. If a SSL proxy is used, domain and path of cookie have to be set differently.
Merge pull request #351 from tmuguet/facebook

[facebook spouts] Switched to HTTP when HTTPS not available
Merge pull request #355 from zajad/patch-1

Update Authentication.php
README.md update
Merge branch 'master' of https://github.com/hayk/selfoss into hayk

Conflicts:
	public/js/selfoss-events-entriestoolbar.js
	templates/item.phtml
README.md updated
pass original url to everything except for opening the url
Replace &bullet; with &bull; in source.phtml

My IE 9 shows the word &bullet; when I manage my sources. The correct entity is &bull;. :)
Merge pull request #360 from gerundt/patch-2

Replace &bullet; with &bull; in source.phtml
Merge pull request #359 from bbeardsley/only_anonymize_open

pass original url to everything except for opening the url
update README.md
Fixed: blog's target link 

Old link target was being resolved to www.aditu.de instead of to the blog section.
Merge pull request #361 from g0to/patch-1

Fixed: blog's target link