Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 19 Sep 2013 01:21:32 +0000 (03:21 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 19 Sep 2013 01:21:32 +0000 (03:21 +0200)
commit784495582d53f5b759dd216ddd1268fbe2479bb9
tree06a1b70513ead76051a42526e7ac953dfb7f108c
parent11c9628ee0bad3e74e60b040986edc59465f4675
parent85ed5fa5dae0fe236584926824f7292b6e697e76
Merge branch 'master' into python3

Conflicts:
wrw/sp/cons.py
wrw/sp/cons.py