Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 19 Jan 2013 00:35:43 +0000 (01:35 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 19 Jan 2013 00:40:55 +0000 (01:40 +0100)
commit9b6845a6a793a189bad2788333663ef4407012e1
treea281402afda4e940c07fa3fcea7a4728872f5e60
parentfbaf5844aa5a362f9c45b07c5066811d45921fba
parent0eaf2431e1ea4e5aabb599d381bff7e71ae69fe9
Merge branch 'master' into python3

Conflicts:
pdm/srv.py
pdm/srv.py