transifex didn't like plural-forms and now they don't like it commented out. So we'll try uncommenting the sucker and see if they like it again.
Merge pull request #275 from MicMee/master

added buttons to perform later hubloc actions
Merge pull request #276 from MicMee/master

no need to have a doule hublocid
Add external resource list so this stuff doesn't get lost. Please update it if you know of other related projects.
Merge https://github.com/friendica/red into zpull
Add BBCode extensions to doco
when loading a single thread on the channel page, tell JS that there isn't any more content to load.
Merge https://github.com/friendica/red into zpull
Debian install script doco
Nginx conf update
lighttpd sample conf update
Merge pull request #277 from git-marijus/master

lighttpd sample conf update
added feed2red.pl
create store directory if it's missing before initialising DAV
move some store things
Merge https://github.com/friendica/red into zpull
sql error
Merge pull request #278 from zzottel/master

added feed2red.pl
fix the admin interface to pending registrations
Merge https://github.com/friendica/red into zpull