githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2012-09-14 d409a545c2ec28b57711c4a6ee6f66b4916932b7

refs
author	Aleksander Machniak <alec@alec.pl>
	Friday, September 14, 2012 08:31 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Friday, September 14, 2012 08:31 -0400
commit	d409a545c2ec28b57711c4a6ee6f66b4916932b7
tree	9e69ff298cafbe78c1abca0aa6491e1c85f89712 tree \| zip \| gz
parent	bf1d94076ddf79df7787f89ff373666d6fbcf30f view \| diff c563c2cc26bd947a5ccee6cae13dc11047d69f09 view \| diff

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

Conflicts:
	CHANGELOG

8 files modified

	CHANGELOG	2 ●●●●● diff \| view \| raw \| blame \| history
	installer/check.php	12 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/config.inc.php.dist	10 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/drivers/sql.php	41 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_imap.php	7 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/includes/messagetoolbar.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/includes/mailtoolbar.html	2 ●●●●● diff \| view \| raw \| blame \| history