githubFork/roundcubemail.git

Roundcubemail devel

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

Thomas Bruederli

2012-09-23 0c144b98a417d50b9c073ae3931fdad47390f1f7

refs
author	Thomas Bruederli <thomas@roundcube.net>
	Sunday, September 23, 2012 16:44 -0400
committer	Thomas Bruederli <thomas@roundcube.net>
	Sunday, September 23, 2012 16:44 -0400
commit	0c144b98a417d50b9c073ae3931fdad47390f1f7
tree	e1a94ada7e5e06fc7c21de13dbb3f86f88634ec7 tree \| zip \| gz
parent	8f098e8dead85b6512ac72b2d805314baec72a2f view \| diff e695162ef76054050e4181e4d28f28cf1981386b view \| diff

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

4 files added

26 files modified

	CHANGELOG	1 ●●●●● diff \| view \| raw \| blame \| history
	config/db.inc.php.dist	1 ●●●●● diff \| view \| raw \| blame \| history
	plugins/database_attachments/database_attachments.php	32 ●●●●● diff \| view \| raw \| blame \| history
	plugins/http_authentication/http_authentication.php	86 ●●●●● diff \| view \| raw \| blame \| history
	plugins/http_authentication/package.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/Changelog	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/config.inc.php.dist	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/lib/rcube_sieve_script.php	96 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/localization/en_GB.inc	9 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/localization/en_US.inc	9 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/localization/pl_PL.inc	9 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/managesieve.js	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/managesieve.php	79 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/package.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/Parser.php	10 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_enotify_a	19 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_enotify_b	18 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_notify_a	18 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_notify_b	17 ●●●●● diff \| view \| raw \| blame \| history
	program/include/html.php	23 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_output_html.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_utils.php	3 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	6 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/edit.inc	7 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/func.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/import.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/func.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Html.php	5 ●●●●● diff \| view \| raw \| blame \| history
	tests/phpunit.xml	2 ●●●●● diff \| view \| raw \| blame \| history