Merge branch 'master' of ssh://btprox.git.sourceforge.net/gitroot/btprox/btprox
Authored by: UrK 2012-01-12
Parent(s): [2639a2][887b2f]
Child(ren): [92240b]
UrK