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)
commit226113c880f90e35dade151807b45138fb306af4
treec60b523a4a406425015fbc3285cee92217881e28
parent8932a66e49dda60bdb6ddb1447df63fea5c4f320
parent79cfb46d42cf0cd296acf7f0689d2ad4b2e7f971
Merge remote-tracking branch 'origin/tox'