gugahoi/maraschino — pull request #5 by DejaVu (2012-03-29 01:49:18+00:00)
Title: Search v3

Can you check this before you merge it.

I got the links working in the Server Settings drop down to NZBMatrix API and NZB.su and literally merged it with the current official master, but 108 commits seems a bit high to me seeing as you recently pulled from your origin/master - unless that was not upto date correctly perhaps?

There was also a conflict reported, nothing major, but I pulled the changes in right, I think.

This works well for me, apart from the confusion for the search function in both NZB Search and Sickbeard, both referred to as '#search' I think.

I'm hoping to rename the Sickbeard side to #sick_search hopefully.