Merge branch 'master' of ssh://aptx.org/var/git/localmylist

author APTX <marek321@gmail.com>

Sat, 13 Apr 2013 17:01:40 +0000 (19:01 +0200)

committer APTX <marek321@gmail.com>

Sat, 13 Apr 2013 17:01:40 +0000 (19:01 +0200)
author APTX <marek321@gmail.com>
Sat, 13 Apr 2013 17:01:40 +0000 (19:01 +0200)
committer APTX <marek321@gmail.com>
Sat, 13 Apr 2013 17:01:40 +0000 (19:01 +0200)
diff --cc localmylist-management/qtsingleapplication/qtlocalpeer.cpp
Simple merge
author	APTX <marek321@gmail.com>
	Sat, 13 Apr 2013 17:01:40 +0000 (19:01 +0200)
committer	APTX <marek321@gmail.com>
	Sat, 13 Apr 2013 17:01:40 +0000 (19:01 +0200)