Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 3 Nov 2013 14:10:10 +0000 (15:10 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 3 Nov 2013 14:17:43 +0000 (15:17 +0100)
commit6d2e09cf5bf8ddfa126ca16d536f6b42e502f0ce
treedf728b970e39124b7710d21b20fdbbd4096f5fd3
parent784495582d53f5b759dd216ddd1268fbe2479bb9
parentecbfa279cc6f56df7a84d150c527923730986d36
Merge branch 'master' into python3
wrw/auth.py
wrw/sp/cons.py