Merge branch 'encrypt'

author APTX <marek321@gmail.com>

Tue, 3 Jan 2012 00:26:38 +0000 (01:26 +0100)

committer APTX <marek321@gmail.com>

Tue, 3 Jan 2012 00:26:38 +0000 (01:26 +0100)
author APTX <marek321@gmail.com>
Tue, 3 Jan 2012 00:26:38 +0000 (01:26 +0100)
committer APTX <marek321@gmail.com>
Tue, 3 Jan 2012 00:26:38 +0000 (01:26 +0100)
diff --cc client.cpp
Simple merge
diff --cc client.h
Simple merge
author	APTX <marek321@gmail.com>
	Tue, 3 Jan 2012 00:26:38 +0000 (01:26 +0100)
committer	APTX <marek321@gmail.com>
	Tue, 3 Jan 2012 00:26:38 +0000 (01:26 +0100)
		1	2
client.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
client.h	patch \|	diff1 \|	diff2 \|	blob \| history