Merge remote-tracking branch 'upstream/master' into clean
authorMichael Wozniak <github@koh.ms>
Sun, 10 Nov 2013 22:00:00 +0000 (17:00 -0500)
committerMichael Wozniak <github@koh.ms>
Sun, 10 Nov 2013 22:00:00 +0000 (17:00 -0500)
1  2 
gui/gtk.py

diff --cc gui/gtk.py
Simple merge