Merge branch 'servers'
authorAmir Taaki <genjix@riseup.net>
Mon, 27 Aug 2012 01:48:57 +0000 (03:48 +0200)
committerAmir Taaki <genjix@riseup.net>
Mon, 27 Aug 2012 01:48:57 +0000 (03:48 +0200)
commit10e3aa7c1e435a2911d964890f5686b9754f8703
tree3f661fbb1cdfb87c448838d1503e886adc4687db
parentf2fb2356433ebc1f0daf76b33d5564cc23cb2881
parent2b6d5ebd5508437870b86e309610236043f9d6f1
Merge branch 'servers'

Conflicts:
lib/gui_lite.py
lib/gui_lite.py