Merge "Fix bug when http:// parsed in ip proxy input" into devel
-rw-r--r-- 134 .gbp.conf
-rw-r--r-- 64 .gitignore
-rw-r--r-- 791 AUTHORS
-rw-r--r-- 17995 COPYING
-rwxr-xr-x 20432 ChangeLog
-rw-r--r-- 840 Makefile
-rw-r--r-- 1432 README.rst
drwxr-xr-x - debian
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - mic
drwxr-xr-x - packaging
drwxr-xr-x - plugins
-rw-r--r-- 3132 setup.py
drwxr-xr-x - tests
drwxr-xr-x - tools