Merge branch 'master' of ralfj.de:dsl
authorConstantin <commit.suicide.enormator@xoxy.net>
Tue, 16 Oct 2012 21:34:37 +0000 (23:34 +0200)
committerConstantin <commit.suicide.enormator@xoxy.net>
Tue, 16 Oct 2012 21:34:37 +0000 (23:34 +0200)
commit33988e416bd971003f213d2bd04fc95104642ef8
tree89e4b2f956f20b4359ee50ef5790527689b3792c
parent45869c9872e2c3c589cf6be3ff257d1095ac4897
parent1b0001147e5d8209a2a2a209edaa93264a143473
Merge branch 'master' of ralfj.de:dsl
gui.py