Merge remote branch 'friendica/master'
privacy_image_cache: The detection for facebook pictures is moved to a better location
Merge remote-tracking branch 'upstream/master'
rendertime: New plugin to show the time that was needed to render a page
Merge branch 'master' of github.com:annando/friendica-addons
rendertime: Adding more variables for measuring performance.
Merge branch 'master' of github.com:annando/friendica-addons
Adding more parameters to rendertime
We should have a .gitignore, really.  This is probably incomplete, but better than nothing.
Merge branch 'master' of https://github.com/friendica/friendica-addons
rendertime: total sum is displayed
pulled from upstream and stuff
s/BeerMonster/Mahjongg/ (weird)
Forumdirectory - don't call hooks.  It was intended as a feature, but people keep reporting it as a bug.
Merge pull request #95 from tonybaldwin/master

fixed mahjongg app menu label
Fix viewsrc to use colorbox.
pkg update
make viewsrc actually use colorbox
privacy_image_cache: Pictures will be compressed before the output
adding current temp/weather plugin