[packages] usbip: remove usbip-server dependency on usbip-client

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@40865 3c298f89-4303-0410-b956-a3cf2f4a3e73
[packages] nmap: bump version to 6.46

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@40866 3c298f89-4303-0410-b956-a3cf2f4a3e73
[packages] git: update to 2.0.0

Signed-off-by: Peter Wagner <tripolar@gmx.at>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@40879 3c298f89-4303-0410-b956-a3cf2f4a3e73
miniupnpd: moved and updated in routing feed

git-svn-id: svn://svn.openwrt.org/openwrt/packages@40883 3c298f89-4303-0410-b956-a3cf2f4a3e73
php4: remove package, it is long obsolete and has many security issues

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@40897 3c298f89-4303-0410-b956-a3cf2f4a3e73
[packages] polipo: update to 1.1.1

Signed-off-by: Gabriel Kerneis <gabriel@kerneis.info>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@40978 3c298f89-4303-0410-b956-a3cf2f4a3e73
[packages] tor: update to 0.2.4.22

Signed-off-by: Peter Wagner <tripolar@gmx.at>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@40996 3c298f89-4303-0410-b956-a3cf2f4a3e73
Merge branch 'master' of git://git.openwrt.org/packages

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

Conflicts:
	net/miniupnpd/Makefile
moved upstream into routing feed