Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
2
3
4
5
6
7
8
BEGIN:VCARD 
VERSION:2.1 
N;ENCODING=QUOTED-PRINTABLE:Iksi=F1ski;Piotr 
FN;ENCODING=QUOTED-PRINTABLE:Piotr Iksi=F1ski 
EMAIL;PREF;INTERNET:piotr.iksinski@somedomain.com 
X-GENDER:Male 
REV:20080716T203548Z 
END:VCARD