merge changes from HEAD
-rw-r--r-- 2854 Makefile
-rw-r--r-- 1750 ModPython.py
drwxr-xr-x - PLC
-rw-r--r-- 2339 PLCAPI.spec
-rwxr-xr-x 2905 Server.py
-rw-r--r-- 1186 TODO
-rwxr-xr-x 10721 Test.py
-rwxr-xr-x 39917 TestPeers.py
drwxr-xr-x - doc
drwxr-xr-x - migrations
-rw-r--r-- 9874 peers-test.mk
drwxr-xr-x - php
-rw-r--r-- 39601 planetlab4.sql
-rwxr-xr-x 5062 plcsh
drwxr-xr-x - psycopg2
drwxr-xr-x - pycurl
-rw-r--r-- 938 refresh-peer.py
-rwxr-xr-x 631 setup.py
-rw-r--r-- 504452 testpeers-eb.ref
-rw-r--r-- 2404696 testpeers-eh.ref
-rw-r--r-- 24800 testpeers-en.ref
-rw-r--r-- 32134 testpeers-m.ref
drwxr-xr-x - tools