githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2012-11-25 5352b55779aadc8b4c665daf69c7a27767f17d78

refs
author	Aleksander Machniak <alec@alec.pl>
	Sunday, November 25, 2012 05:25 -0500
committer	Aleksander Machniak <alec@alec.pl>
	Sunday, November 25, 2012 05:25 -0500
commit	5352b55779aadc8b4c665daf69c7a27767f17d78
tree	07b1dbe580b644d2578071956349bffac63b6b4c tree \| zip \| gz
parent	297c1afb80bc73e595a6dad42adcd536cf947ea8 view \| diff 65dff8f812cc6b0c4fdd470905700143910289b2 view \| diff

Merge branch 'master' of github.com:roundcube/roundcubemail

Conflicts:
	CHANGELOG

1 files added

8 files modified

	CHANGELOG	1 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	34 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_imap.php	12 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_vcard.php	793 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/edit.inc	4 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/func.inc	11 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/import.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/compose.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/func.inc	2 ●●●●● diff \| view \| raw \| blame \| history