Merge pull request #621 from atomizer/master
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 8 Jan 2013 08:57:46 +0000 (00:57 -0800)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 8 Jan 2013 08:57:46 +0000 (00:57 -0800)
justin.tv tweaks


Trivial merge