Merge branch 'master' into python2
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 9 May 2014 06:15:16 +0000 (08:15 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 9 May 2014 06:15:16 +0000 (08:15 +0200)
commit2b4cce75e1eb09715b27fa94b63484c0a6f5a032
tree14d278ea3e5a6678ec0924efcb1431120d47784a
parent0d4c1b8b8da9e20c4bc9fb41ff1136283821b98e
parentab4f58a02fb66610c4bda3d4763f455e764c51be
Merge branch 'master' into python2
wrw/util.py