reduce the likelihood that a given channel will have 30-40 valid hublocs with the same hubloc_url.
Quick hack to allow themes/modules to use different CSS classes for the ACL selector's icon (e.g. icon-lock/icon-unlock instead of lock/unlock). Unless a theme supports it, they'll stay at their former values. Dunno if it's the best way to achieve this, though.
Merge branch 'master' of https://github.com/friendica/red
add xmlrpc method for importing red comments
add photos to red-to-wordpress comments
Merge branch 'master' of https://github.com/friendica/red
Merge pull request #216 from omigeot/master

Make CSS classes for ACL "lock" icon customizable
synchronise deletion of comments between red and wp
Merge https://github.com/friendica/red into zpull
Plurals for conversation.php
Merge pull request #217 from omigeot/master

Plurals for conversation.php
zot doco
Merge https://github.com/friendica/red into zpull
only list undeleted hublocs in zot_finger
doco
item store hooks
doco
make the template processor (e.g. replace_macros) pluggable
doc updates
allow themes to mess with the navbar contents without a custom template. It's done as a callback using a transient plugin hook.
For instance to get rid of the notifications link:

insert_hook('nav','strip_notify');

function strip_notify($a,&$b) {
    unset($b['nav']['notifications']);
}