Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000 (07:56 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 27 Sep 2013 05:56:55 +0000 (07:56 +0200)
commit38fac1fb15e1d32173edbef33b07f8fc7799ae02
tree5eef048bc4bcbcffbfea6c25c2ca1289a4b86860
parentebe466f227b464a7457dee55accb1b426821c7c9
parent4f2f6fd6108df7743c922600617f6a6770e26d78
Merge branch 'master' into python3

Conflicts:
setup.py
setup.py