Merge branch 'master' into feature/label_sync
authorMaran <maran.hidskes@gmail.com>
Sun, 10 Mar 2013 20:34:10 +0000 (21:34 +0100)
committerMaran <maran.hidskes@gmail.com>
Sun, 10 Mar 2013 20:34:10 +0000 (21:34 +0100)
commite4ec690ffd70956331ea2e04aee1f963c3d19f68
tree5ed76ffb41df8ed4ba98a03aa9cf0c73ea37c1d7
parentc61f16ba0d0af17e5d428d4c4a45c131db9247ff
parent65e257a5377cd05bdec3752c06f93873da0ecac1
Merge branch 'master' into feature/label_sync
gui/gui_classic.py