merge changes from head
-rw-r--r-- 2784 Makefile
-rw-r--r-- 1615 ModPython.py
drwxr-xr-x - PLC
-rw-r--r-- 2312 PLCAPI.spec
-rwxr-xr-x 2905 Server.py
-rw-r--r-- 1186 TODO
-rwxr-xr-x 10721 Test.py
-rwxr-xr-x 39777 TestPeers.py
drwxr-xr-x - doc
drwxr-xr-x - migrations
-rw-r--r-- 9874 peers-test.mk
drwxr-xr-x - php
-rw-r--r-- 37324 planetlab4.sql
-rwxr-xr-x 4985 plcsh
drwxr-xr-x - psycopg2
drwxr-xr-x - pycurl
-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