Merge branch 'trunk' into 0.4-release-staging

Conflicts:
	README
	src/org/waveprotocol/box/waveimport/WaveExport.java
	src/org/waveprotocol/box/waveimport/WaveImport.java
	src/org/waveprotocol/box/waveimport/google/RobotApi.java
	src/org/waveprotocol/box/waveimport/google/RobotSearchDigest.java
	src/org/waveprotocol/box/waveimport/google/RobotSearchDigestGsonImpl.java
	src/org/waveprotocol/box/waveimport/google/RobotSearchDigestImpl.java
	src/org/waveprotocol/box/waveimport/google/RobotSearchDigestUtil.java
	src/org/waveprotocol/box/waveimport/google/oauth/NeedNewOAuthTokenException.java
	src/org/waveprotocol/box/waveimport/google/oauth/OAuthCredentials.java
	src/org/waveprotocol/box/waveimport/google/oauth/OAuthRequestHelper.java
	src/org/waveprotocol/box/waveimport/google/oauth/OAuthedFetchService.java
	src/org/waveprotocol/box/waveimport/google/oauth/StableUserId.java
	src/org/waveprotocol/box/waveimport/google/oauth/UserContext.java
	src/org/waveprotocol/box/webclient/client/i18n/SessionMessages_es.properties
	src/org/waveprotocol/box/webclient/client/i18n/SessionMessages_fr.properties
	src/org/waveprotocol/box/webclient/client/i18n/WebClientMessages_es.properties
	src/org/waveprotocol/box/webclient/client/i18n/WebClientMessages_fr.properties
	src/org/waveprotocol/box/webclient/search/i18n/SearchPresenterMessages_sl.properties
	src/org/waveprotocol/box/webclient/search/i18n/SearchWidgetMessages_es.properties
	src/org/waveprotocol/box/webclient/search/i18n/SearchWidgetMessages_sl.properties
	src/org/waveprotocol/box/webclient/widget/error/i18n/ErrorMessages_es.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/edit/i18n/ActionMessages_es.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/menu/i18n/MenuMessages_fr.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/menu/i18n/MenuMessages_sl.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/attachment/i18n/AttachmentMessages_fr.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/attachment/i18n/AttachmentMessages_sl.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/i18n/GadgetCategoryMessages_es.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/i18n/GadgetSelectorMessages_sl.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/i18n/LinkerMessages_es.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/i18n/LinkerMessages_fr.properties
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/i18n/ToolbarMessages_fr.properties
	src/org/waveprotocol/wave/client/wavepanel/view/dom/full/i18n/ReplyBoxMessages_es.properties
	src/org/waveprotocol/wave/client/wavepanel/view/dom/full/i18n/ReplyBoxMessages_fr.properties
	src/org/waveprotocol/wave/client/widget/profile/i18n/ProfilePopupMessages_es.properties
	src/org/waveprotocol/wave/migration/build.xml

git-svn-id: https://svn.apache.org/repos/asf/incubator/wave/branches/wave-0.4-release@1517927 13f79535-47bb-0310-9956-ffa450edef68
Remove third_party folder and all contents

git-svn-id: https://svn.apache.org/repos/asf/incubator/wave/branches/wave-0.4-release@1517929 13f79535-47bb-0310-9956-ffa450edef68