Removing duplicate function definition (must be a problematic merge)
Merge branch 'master' of github.com:niryariv/opentaba-server
Merge pull request #55 from shevron/fix/remove-dup-funcdef

Bugfix: removing duplicate definition of _plans_query_to_atom_feed()