Fix merge conflicts
authorMaran <maran.hidskes@gmail.com>
Thu, 16 Aug 2012 21:36:41 +0000 (23:36 +0200)
committerMaran <maran.hidskes@gmail.com>
Thu, 16 Aug 2012 21:36:41 +0000 (23:36 +0200)
commit39660eeac51391a4be673a57db6382a3ee203dcd
tree2daaee29c061f705fa461da23d35d64c33b3cbb0
parent95d8adb8fcd4e5f9b3876be053ce0f780646a4b3
parent7d7a32e1ad942f737d9da5492eebf30fa4ec2bc1
Fix merge conflicts
lib/gui_lite.py