Merge branch 'master' into python2
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 23 Apr 2014 01:35:56 +0000 (03:35 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 23 Apr 2014 01:35:56 +0000 (03:35 +0200)
commit6963e4742e2d7e5eb9f783a5fc0380e18d8e2cb6
tree6041a703e76fc2ad9d2551b712854cdbcdba81f5
parentd76b5228df5eb50b01f4b81e6a67b8fc80bf6437
parent438b6207201da45a2f23e6ff207a61a0f57b20f3
Merge branch 'master' into python2
wrw/util.py