jQuery 1.10.0
defaultCodeblocks plugin
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6
package update
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6
release version
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6
Japanese translation
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6

Conflicts:
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.mo
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.po

	modified:   themes/default/index.php
	modified:   themes/stopdesign/comment_form/comment_form.php
	modified:   zp-core/admin-edit.php
	modified:   zp-core/functions-basic.php
	modified:   zp-core/functions.php
	modified:   zp-core/locale/de_DE/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/de_DE/LC_MESSAGES/zenphoto.po
	modified:   zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.mo
	modified:   zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.po
	modified:   zp-core/template-functions.php
	modified:   zp-core/zp-extensions/GoogleMap.php
	modified:   zp-core/zp-extensions/comment_form/comment_form.php
	modified:   zp-core/zp-extensions/comment_form/functions.php
	modified:   zp-core/zp-extensions/contact_form/form.php
	modified:   zp-core/zp-extensions/html_meta_tags.php
	modified:   zp-core/zp-extensions/reCaptcha/recaptchalib.php
	modified:   zp-core/zp-extensions/register_user/register_user_form.php
	modified:   zp-core/zp-extensions/themeSwitcher.php
restore japanese translation to its proper state
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6
some strange change that I cannot get rid of
	modified:   zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.po
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6
merge from 1.4.5
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6

Conflicts:
	zp-core/zp-extensions/contact_form/form.php
	zp-core/zp-extensions/slideshow.php

	modified:   themes/default/styles/dark.css
	modified:   themes/default/styles/light.css
	modified:   themes/default/styles/sterile-dark.css
	modified:   themes/default/styles/sterile-light.css
	modified:   themes/effervescence_plus/common.css
	modified:   themes/garland/zen.css
	modified:   themes/stopdesign/css/master.css
	modified:   themes/zenpage/style.css
	modified:   zp-core/zp-extensions/contact_form/form.php
	modified:   zp-core/zp-extensions/favoritesHandler.php
	modified:   zp-core/zp-extensions/reCaptcha.php
	modified:   zp-core/zp-extensions/slideshow.php
	modified:   zp-core/zp-extensions/zpCaptcha.php
Changes that should have been merged from 1.4.5 but were not
file to be removed
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6
Merge remote-tracking branch 'origin/1.4.5' into 1.4.6