Merge remote-tracking branch 'origin/tox'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 5 Oct 2013 20:47:44 +0000 (22:47 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 5 Oct 2013 20:47:44 +0000 (22:47 +0200)

Trivial merge