Index: branches/2019Q4/chinese/wordpress-zh_CN/Makefile =================================================================== --- branches/2019Q4/chinese/wordpress-zh_CN/Makefile (revision 517312) +++ branches/2019Q4/chinese/wordpress-zh_CN/Makefile (revision 517313) @@ -1,58 +1,58 @@ # Created by: Joe Horn # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.3 +DISTVERSION= 5.2.4 DISTVERSIONSUFFIX= -zh_CN CATEGORIES= chinese www MASTER_SITES= http://cn.wordpress.org/ PKGNAMESUFFIX= -zh_CN MAINTAINER= joneum@FreeBSD.org COMMENT= State-of-the-art semantic personal publishing platform LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt WRKSRC= ${WRKDIR}/${PORTNAME} USES= php:web USE_PHP= curl gd mysqli pcre tokenizer xml zip NO_ARCH= yes NO_BUILD= yes PLIST= ${WRKDIR}/pkg-plist WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= readme.html OPTIONS_DEFINE= DOCS SUB_FILES= pkg-message pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 1 . endif pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ ${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi do-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ ${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \; do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: branches/2019Q4/chinese/wordpress-zh_CN/distinfo =================================================================== --- branches/2019Q4/chinese/wordpress-zh_CN/distinfo (revision 517312) +++ branches/2019Q4/chinese/wordpress-zh_CN/distinfo (revision 517313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567784871 -SHA256 (wordpress-5.2.3-zh_CN.tar.gz) = 02652f946b0180a1c781f3aa0c91f2402353e427347e7978564f093b5c222f61 -SIZE (wordpress-5.2.3-zh_CN.tar.gz) = 11814081 +TIMESTAMP = 1573544023 +SHA256 (wordpress-5.2.4-zh_CN.tar.gz) = 4d16b0d3e87fb8f89dd464422d4325c225932f974553d3d64d6253487898d246 +SIZE (wordpress-5.2.4-zh_CN.tar.gz) = 11805777 Index: branches/2019Q4/chinese/wordpress-zh_TW/Makefile =================================================================== --- branches/2019Q4/chinese/wordpress-zh_TW/Makefile (revision 517312) +++ branches/2019Q4/chinese/wordpress-zh_TW/Makefile (revision 517313) @@ -1,58 +1,58 @@ # Created by: Joe Horn # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 5.2.3 +PORTVERSION= 5.2.4 DISTVERSIONSUFFIX= -zh_TW CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ PKGNAMESUFFIX= -zh_TW MAINTAINER= joneum@FreeBSD.org COMMENT= State-of-the-art semantic personal publishing platform LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt WRKSRC= ${WRKDIR}/${PORTNAME} USES= php:web USE_PHP= curl gd mysqli pcre tokenizer xml zip ftp NO_ARCH= yes NO_BUILD= yes PLIST= ${WRKDIR}/pkg-plist WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= readme.html OPTIONS_DEFINE= DOCS SUB_FILES= pkg-message pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 1 . endif pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ ${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi do-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ ${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \; do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: branches/2019Q4/chinese/wordpress-zh_TW/distinfo =================================================================== --- branches/2019Q4/chinese/wordpress-zh_TW/distinfo (revision 517312) +++ branches/2019Q4/chinese/wordpress-zh_TW/distinfo (revision 517313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567784902 -SHA256 (wordpress-5.2.3-zh_TW.tar.gz) = eaf447c6f5ebf5fd368c6fb82ac9c1becd705c07ec92ec97b0b6386ab06049ac -SIZE (wordpress-5.2.3-zh_TW.tar.gz) = 11810856 +TIMESTAMP = 1573544066 +SHA256 (wordpress-5.2.4-zh_TW.tar.gz) = da1701200a5c197399e8d2ec66d0bc1bf7eb434a81f6f9bfa5c3c7dc48ad6c99 +SIZE (wordpress-5.2.4-zh_TW.tar.gz) = 11865761 Index: branches/2019Q4/french/wordpress/Makefile =================================================================== --- branches/2019Q4/french/wordpress/Makefile (revision 517312) +++ branches/2019Q4/french/wordpress/Makefile (revision 517313) @@ -1,57 +1,57 @@ # Created by: Elvis Chiang # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.3 +DISTVERSION= 5.2.4 DISTVERSIONSUFFIX= -fr_FR PORTEPOCH= 1 CATEGORIES= french www MASTER_SITES= http://fr.wordpress.org/ MAINTAINER= joneum@FreeBSD.org COMMENT= State-of-the-art semantic personal publishing platform LICENSE= GPLv2 CONFLICTS_INSTALL= de-wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].* NO_ARCH= yes NO_BUILD= yes USES= php:web cpe USE_PHP= curl gd hash mysqli pcre tokenizer xml zip zlib ftp WRKSRC= ${WRKDIR}/${PORTNAME} .if ${DISTVERSION:N*.*.*} CPE_VERSION= ${DISTVERSION}.0 .endif SUB_FILES= pkg-message PLIST= ${WRKDIR}/pkg-plist PORTDOCS= license.txt readme.html OPTIONS_DEFINE= DOCS pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 1 . endif pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ ${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi do-install: ${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ ${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \; ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: branches/2019Q4/french/wordpress/distinfo =================================================================== --- branches/2019Q4/french/wordpress/distinfo (revision 517312) +++ branches/2019Q4/french/wordpress/distinfo (revision 517313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567784981 -SHA256 (wordpress-5.2.3-fr_FR.tar.gz) = 9657d8dc7804becddf821c05773081ffd97e001613c354154771e14f6eab677f -SIZE (wordpress-5.2.3-fr_FR.tar.gz) = 11841146 +TIMESTAMP = 1573544131 +SHA256 (wordpress-5.2.4-fr_FR.tar.gz) = d302800931a2a67e260e95c772d211e037db11cea56276bcbb97143f74fa4972 +SIZE (wordpress-5.2.4-fr_FR.tar.gz) = 11831338 Index: branches/2019Q4/german/wordpress/Makefile =================================================================== --- branches/2019Q4/german/wordpress/Makefile (revision 517312) +++ branches/2019Q4/german/wordpress/Makefile (revision 517313) @@ -1,59 +1,59 @@ # Created by: miwi # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.3 +DISTVERSION= 5.2.4 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ MAINTAINER= joneum@FreeBSD.org COMMENT= State-of-the-art semantic personal publishing platform LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/license.txt CONFLICTS_INSTALL= wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].* NO_ARCH= yes NO_BUILD= yes USES= php:web cpe USE_PHP= curl gd hash mysqli pcre tokenizer xml zip zlib ftp WRKSRC= ${WRKDIR}/${PORTNAME} CPE_LANG= de .if ${DISTVERSION:N*.*.*} CPE_VERSION= ${DISTVERSION}.0 .endif SUB_FILES= pkg-message PLIST= ${WRKDIR}/pkg-plist PORTDOCS= license.txt readme.html OPTIONS_DEFINE= DOCS pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 1 . endif pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ ${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi do-install: ${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ ${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \; ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: branches/2019Q4/german/wordpress/distinfo =================================================================== --- branches/2019Q4/german/wordpress/distinfo (revision 517312) +++ branches/2019Q4/german/wordpress/distinfo (revision 517313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567785060 -SHA256 (wordpress-5.2.3-de_DE.tar.gz) = 4f94741c2c640bb3a4fb163db0769cacb13d6e5adfaf79bfed912a603cde8c32 -SIZE (wordpress-5.2.3-de_DE.tar.gz) = 11845849 +TIMESTAMP = 1573544165 +SHA256 (wordpress-5.2.4-de_DE.tar.gz) = bf05ed49056de3063de772ce1dd62149af2605ce40c95f615d04063b23efb96c +SIZE (wordpress-5.2.4-de_DE.tar.gz) = 11845781 Index: branches/2019Q4/japanese/wordpress/Makefile =================================================================== --- branches/2019Q4/japanese/wordpress/Makefile (revision 517312) +++ branches/2019Q4/japanese/wordpress/Makefile (revision 517313) @@ -1,61 +1,61 @@ # Created by: Takefu # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.3 +DISTVERSION= 5.2.4 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ MAINTAINER= joneum@FreeBSD.org COMMENT= State-of-the-art semantic personal publishing platform LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/license.txt CONFLICTS_INSTALL= wordpress-[0-9].* de-wordpress-[0-9].* ru-wordpress-[0-9].* NO_ARCH= yes NO_BUILD= yes USES= cpe php:web USE_PHP= curl gd mysqli pcre tokenizer xml zip zlib ftp WRKSRC= ${WRKDIR}/${PORTNAME} CPE_LANG= ja .if ${DISTVERSION:N*.*.*} CPE_VERSION= ${DISTVERSION}.0 .endif SUB_FILES= pkg-message PLIST= ${WRKDIR}/pkg-plist PORTDOCS= license.txt readme.html OPTIONS_DEFINE= DOCS pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 1 . endif pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ ${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi do-install: ${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ ${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \; do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: branches/2019Q4/japanese/wordpress/distinfo =================================================================== --- branches/2019Q4/japanese/wordpress/distinfo (revision 517312) +++ branches/2019Q4/japanese/wordpress/distinfo (revision 517313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567785101 -SHA256 (wordpress-5.2.3-ja.tar.gz) = f5f71765c12ca96248f9c1fd9a71cbfbc6d7af8ca455e294b4005a90773692bc -SIZE (wordpress-5.2.3-ja.tar.gz) = 11847107 +TIMESTAMP = 1573544196 +SHA256 (wordpress-5.2.4-ja.tar.gz) = 71a359f65626ba2c610b922d1dd53da140329ea2aeae13415a30e16fcb7168ae +SIZE (wordpress-5.2.4-ja.tar.gz) = 11835884 Index: branches/2019Q4/russian/wordpress/Makefile =================================================================== --- branches/2019Q4/russian/wordpress/Makefile (revision 517312) +++ branches/2019Q4/russian/wordpress/Makefile (revision 517313) @@ -1,60 +1,60 @@ # Created by: Mihail Timofeev <9267096@gmail.com> # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.3 +DISTVERSION= 5.2.4 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ MAINTAINER= joneum@FreeBSD.org COMMENT= State-of-the-art semantic personal publishing platform LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt CONFLICTS_INSTALL= wordpress-[0-9].* de-wordpress-[0-9].* ja-wordpress-[0-9].* NO_ARCH= yes NO_BUILD= yes USES= php:web cpe USE_PHP= curl gd hash mysqli pcre tokenizer xml zip zlib ftp WRKSRC= ${WRKDIR}/${PORTNAME} CPE_LANG= ru .if ${DISTVERSION:N*.*.*} CPE_VERSION= ${DISTVERSION}.0 .endif SUB_FILES= pkg-message PLIST= ${WRKDIR}/pkg-plist PORTDOCS= license.txt readme.html OPTIONS_DEFINE= DOCS pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 1 . endif pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ ${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi do-install: @${MKDIR} ${STAGEDIR}${WWWDIR}/ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ ${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \; do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: branches/2019Q4/russian/wordpress/distinfo =================================================================== --- branches/2019Q4/russian/wordpress/distinfo (revision 517312) +++ branches/2019Q4/russian/wordpress/distinfo (revision 517313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567785131 -SHA256 (wordpress-5.2.3-ru_RU.tar.gz) = ab6a1cb042ac3c966e7bf17a824d71543de99d4e3459c8a0cb703f8513139de0 -SIZE (wordpress-5.2.3-ru_RU.tar.gz) = 11904034 +TIMESTAMP = 1573544235 +SHA256 (wordpress-5.2.4-ru_RU.tar.gz) = a65d943da8c05ef8ddd0ab8fc6db8fabf8a847d6e5bf1aa636133dc71b02de8a +SIZE (wordpress-5.2.4-ru_RU.tar.gz) = 11895382 Index: branches/2019Q4/www/wordpress/Makefile =================================================================== --- branches/2019Q4/www/wordpress/Makefile (revision 517312) +++ branches/2019Q4/www/wordpress/Makefile (revision 517313) @@ -1,56 +1,56 @@ # Created by: Elvis Chiang # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.3 +DISTVERSION= 5.2.4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ MAINTAINER= joneum@FreeBSD.org COMMENT= State-of-the-art semantic personal publishing platform LICENSE= GPLv2 CONFLICTS_INSTALL= de-wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].* NO_ARCH= yes NO_BUILD= yes USES= php:web cpe USE_PHP= curl gd hash mysqli pcre tokenizer xml zip zlib ftp WRKSRC= ${WRKDIR}/${PORTNAME} .if ${DISTVERSION:N*.*.*} CPE_VERSION= ${DISTVERSION}.0 .endif SUB_FILES= pkg-message PLIST= ${WRKDIR}/pkg-plist PORTDOCS= license.txt readme.html OPTIONS_DEFINE= DOCS pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 1 . endif pre-install: ${ECHO_CMD} '@owner www' > ${PLIST} ${ECHO_CMD} '@group www' >> ${PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST} ${ECHO_CMD} '@owner' >> ${PLIST} ${ECHO_CMD} '@group' >> ${PLIST} if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \ ${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi do-install: ${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/ ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/ ${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w {} \; ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: branches/2019Q4/www/wordpress/distinfo =================================================================== --- branches/2019Q4/www/wordpress/distinfo (revision 517312) +++ branches/2019Q4/www/wordpress/distinfo (revision 517313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567785174 -SHA256 (wordpress-5.2.3.tar.gz) = 990f93815160ef75850f515608d812337982d2f79c1a34a0727e476ce16ff81d -SIZE (wordpress-5.2.3.tar.gz) = 11198223 +TIMESTAMP = 1573544277 +SHA256 (wordpress-5.2.4.tar.gz) = 37b46af6e44233de32c2e713c4e6229d8a1bcd30b67be3ffeefa0c9e8110c5ed +SIZE (wordpress-5.2.4.tar.gz) = 11199173 Index: branches/2019Q4 =================================================================== --- branches/2019Q4 (revision 517312) +++ branches/2019Q4 (revision 517313) Property changes on: branches/2019Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r517312