update
Merge branch 'master' of https://github.com/frient/htdocs

Conflicts:
	khotel/addyosmani-jquery-ui-bootstrap-v0.23-0-gf8f427c/addyosmani-jquery-ui-bootstrap-cf2a77b/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png
	khotel/addyosmani-jquery-ui-bootstrap-v0.23-0-gf8f427c/addyosmani-jquery-ui-bootstrap-cf2a77b/css/custom-theme/images/ui-icons_222222_256x240.png
	khotel/addyosmani-jquery-ui-bootstrap-v0.23-0-gf8f427c/addyosmani-jquery-ui-bootstrap-cf2a77b/css/custom-theme/images/ui-icons_2e83ff_256x240.png
	khotel/addyosmani-jquery-ui-bootstrap-v0.23-0-gf8f427c/addyosmani-jquery-ui-bootstrap-cf2a77b/css/custom-theme/images/ui-icons_454545_256x240.png
	khotel/addyosmani-jquery-ui-bootstrap-v0.23-0-gf8f427c/addyosmani-jquery-ui-bootstrap-cf2a77b/css/custom-theme/images/ui-icons_888888_256x240.png
	khotel/jquery-ui-bootstrap-v0.23-0/README.md
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/bootstrap.css
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-alerts.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-buttons.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-dropdown.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-modal.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-popover.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-scrollspy.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-tabs.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/bootstrap-twipsy.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/index.html
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-alerts.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-buttons.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-dropdown.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-modal.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-popover.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-scrollspy.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-tabs.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/unit/bootstrap-twipsy.js
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/vendor/qunit.css
	khotel/jquery-ui-bootstrap-v0.23-0/bootstrap/js/tests/vendor/qunit.js
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-icons_222222_256x240.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-icons_2e83ff_256x240.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-icons_454545_256x240.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-icons_888888_256x240.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-icons_cd0a0a_256x240.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/images/ui-icons_f6cf3b_256x240.png
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/jquery-ui-1.8.16.custom.css
	khotel/jquery-ui-bootstrap-v0.23-0/css/custom-theme/jquery.ui.1.8.16.ie.css
	khotel/jquery-ui-bootstrap-v0.23-0/css/demo.css
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/bootstrap.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/forms.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/mixins.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/patterns.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/reset.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/scaffolding.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/tables.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/type.less
	khotel/jquery-ui-bootstrap-v0.23-0/css/less/variables.less
	khotel/jquery-ui-bootstrap-v0.23-0/index.html
	khotel/jquery-ui-bootstrap-v0.23-0/js/demo.js
	khotel/jquery-ui-bootstrap-v0.23-0/js/jquery-1.6.2.min.js
	khotel/jquery-ui-bootstrap-v0.23-0/js/jquery-ui-1.8.16.custom.min.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-Date-Range-Picker/css/ui.daterangepicker.css
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-Date-Range-Picker/index.html
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-Date-Range-Picker/js/date.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.compressed.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-FileInput/css/enhanced.css
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-FileInput/images/icon-generic.gif
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-FileInput/images/icon-image.gif
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-FileInput/images/icon-media.gif
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-FileInput/images/icon-zip.gif
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-FileInput/js/enhance.min.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/jQuery-UI-FileInput/js/fileinput.jquery.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/wijmo/jquery.bgiframe-2.1.3-pre.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/wijmo/jquery.mousewheel.min.js
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/wijmo/jquery.wijmo-open.1.5.0.css
	khotel/jquery-ui-bootstrap-v0.23-0/third-party/wijmo/jquery.wijmo-open.1.5.0.min.js
	khotel/single.html
	wp/yoyaku-au/jp/wp-content/plugins/custom-field-suite/core/fields/date/images/ui-bg_glass_65_ffffff_1x400.png
	wp/yoyaku-au/jp/wp-content/plugins/custom-field-suite/core/fields/date/images/ui-icons_ef8c08_256x240.png
	wp/yoyaku-au/jp/wp-content/plugins/custom-field-suite/core/fields/date/images/ui-icons_ffffff_256x240.png
	wp/yoyaku-au/jp/wp-content/themes/yoyaku-au/css/jquery/images/ui-icons_222222_256x240.png
	wp/yoyaku-au/jp/wp-content/themes/yoyaku-au/css/jquery/images/ui-icons_228ef1_256x240.png
update
Merge branch 'master' of https://github.com/frient/htdocs.git
update
update
delete
new
update
Merge branch 'master' of https://github.com/frient/htdocs

Conflicts:
	cake13/app/controllers/kaitakus/kaitakus_controller.php
	cake13/app/libs/tcpdf/2dbarcodes.php
	cake13/app/libs/tcpdf/CHANGELOG.TXT
	cake13/app/libs/tcpdf/LICENSE.TXT
	cake13/app/libs/tcpdf/README.TXT
	cake13/app/libs/tcpdf/barcodes.php
	cake13/app/libs/tcpdf/composer.json
	cake13/app/libs/tcpdf/config/lang/afr.php
	cake13/app/libs/tcpdf/config/lang/ara.php
	cake13/app/libs/tcpdf/config/lang/aze.php
	cake13/app/libs/tcpdf/config/lang/bel.php
	cake13/app/libs/tcpdf/config/lang/bra.php
	cake13/app/libs/tcpdf/config/lang/bul.php
	cake13/app/libs/tcpdf/config/lang/cat.php
	cake13/app/libs/tcpdf/config/lang/ces.php
	cake13/app/libs/tcpdf/config/lang/chi.php
	cake13/app/libs/tcpdf/config/lang/cym.php
	cake13/app/libs/tcpdf/config/lang/dan.php
	cake13/app/libs/tcpdf/config/lang/eng.php
	cake13/app/libs/tcpdf/config/lang/est.php
	cake13/app/libs/tcpdf/config/lang/eus.php
	cake13/app/libs/tcpdf/config/lang/far.php
	cake13/app/libs/tcpdf/config/lang/fra.php
	cake13/app/libs/tcpdf/config/lang/ger.php
	cake13/app/libs/tcpdf/config/lang/gle.php
	cake13/app/libs/tcpdf/config/lang/glg.php
	cake13/app/libs/tcpdf/config/lang/hat.php
	cake13/app/libs/tcpdf/config/lang/heb.php
	cake13/app/libs/tcpdf/config/lang/hrv.php
	cake13/app/libs/tcpdf/config/lang/hun.php
	cake13/app/libs/tcpdf/config/lang/hye.php
	cake13/app/libs/tcpdf/config/lang/ind.php
	cake13/app/libs/tcpdf/config/lang/ita.php
	cake13/app/libs/tcpdf/config/lang/jpn.php
	cake13/app/libs/tcpdf/config/lang/kat.php
	cake13/app/libs/tcpdf/config/lang/kor.php
	cake13/app/libs/tcpdf/config/lang/mkd.php
	cake13/app/libs/tcpdf/config/lang/mlt.php
	cake13/app/libs/tcpdf/config/lang/msa.php
	cake13/app/libs/tcpdf/config/lang/nld.php
	cake13/app/libs/tcpdf/config/lang/nob.php
	cake13/app/libs/tcpdf/config/lang/pol.php
	cake13/app/libs/tcpdf/config/lang/por.php
	cake13/app/libs/tcpdf/config/lang/ron.php
	cake13/app/libs/tcpdf/config/lang/rus.php
	cake13/app/libs/tcpdf/config/lang/slv.php
	cake13/app/libs/tcpdf/config/lang/spa.php
	cake13/app/libs/tcpdf/config/lang/sqi.php
	cake13/app/libs/tcpdf/config/lang/srp.php
	cake13/app/libs/tcpdf/config/lang/swa.php
	cake13/app/libs/tcpdf/config/lang/swe.php
	cake13/app/libs/tcpdf/config/lang/ukr.php
	cake13/app/libs/tcpdf/config/lang/urd.php
	cake13/app/libs/tcpdf/config/lang/yid.php
	cake13/app/libs/tcpdf/config/lang/zho.php
	cake13/app/libs/tcpdf/config/tcpdf_config.php
	cake13/app/libs/tcpdf/config/tcpdf_config_alt.php
	cake13/app/libs/tcpdf/datamatrix.php
	cake13/app/libs/tcpdf/doc/index.html
	cake13/app/libs/tcpdf/encodings_maps.php
	cake13/app/libs/tcpdf/examples/example_001.php
	cake13/app/libs/tcpdf/examples/example_002.php
	cake13/app/libs/tcpdf/examples/example_003.php
	cake13/app/libs/tcpdf/examples/example_004.php
	cake13/app/libs/tcpdf/examples/example_005.php
	cake13/app/libs/tcpdf/examples/example_006.php
	cake13/app/libs/tcpdf/examples/example_007.php
	cake13/app/libs/tcpdf/examples/example_008.php
	cake13/app/libs/tcpdf/examples/example_009.php
	cake13/app/libs/tcpdf/examples/example_010.php
	cake13/app/libs/tcpdf/examples/example_011.php
	cake13/app/libs/tcpdf/examples/example_012.php
	cake13/app/libs/tcpdf/examples/example_013.php
	cake13/app/libs/tcpdf/examples/example_014.php
	cake13/app/libs/tcpdf/examples/example_015.php
	cake13/app/libs/tcpdf/examples/example_016.php
	cake13/app/libs/tcpdf/examples/example_017.php
	cake13/app/libs/tcpdf/examples/example_018.php
	cake13/app/libs/tcpdf/examples/example_019.php
	cake13/app/libs/tcpdf/examples/example_020.php
	cake13/app/libs/tcpdf/examples/example_021.php
	cake13/app/libs/tcpdf/examples/example_022.php
	cake13/app/libs/tcpdf/examples/example_023.php
	cake13/app/libs/tcpdf/examples/example_024.php
	cake13/app/libs/tcpdf/examples/example_025.php
	cake13/app/libs/tcpdf/examples/example_026.php
	cake13/app/libs/tcpdf/examples/example_027.php
	cake13/app/libs/tcpdf/examples/example_028.php
	cake13/app/libs/tcpdf/examples/example_029.php
	cake13/app/libs/tcpdf/examples/example_030.php
	cake13/app/libs/tcpdf/examples/example_031.php
	cake13/app/libs/tcpdf/examples/example_032.php
	cake13/app/libs/tcpdf/examples/example_033.php
	cake13/app/libs/tcpdf/examples/example_034.php
	cake13/app/libs/tcpdf/examples/example_035.php
	cake13/app/libs/tcpdf/examples/example_036.php
	cake13/app/libs/tcpdf/examples/example_037.php
	cake13/app/libs/tcpdf/examples/example_038.php
	cake13/app/libs/tcpdf/examples/example_039.php
	cake13/app/libs/tcpdf/examples/example_040.php
	cake13/app/libs/tcpdf/examples/example_042.php
	cake13/app/libs/tcpdf/examples/example_043.php
	cake13/app/libs/tcpdf/examples/example_044.php
	cake13/app/libs/tcpdf/examples/example_045.php
	cake13/app/libs/tcpdf/examples/example_046.php
	cake13/app/libs/tcpdf/examples/example_047.php
	cake13/app/libs/tcpdf/examples/example_048.php
	cake13/app/libs/tcpdf/examples/example_049.php
	cake13/app/libs/tcpdf/examples/example_050.php
	cake13/app/libs/tcpdf/examples/example_051.php
	cake13/app/libs/tcpdf/examples/example_052.php
	cake13/app/libs/tcpdf/examples/example_053.php
	cake13/app/libs/tcpdf/examples/example_054.php
	cake13/app/libs/tcpdf/examples/example_055.php
	cake13/app/libs/tcpdf/examples/example_056.php
	cake13/app/libs/tcpdf/examples/example_057.php
	cake13/app/libs/tcpdf/examples/example_058.php
	cake13/app/libs/tcpdf/examples/example_059.php
	cake13/app/libs/tcpdf/examples/example_060.php
	cake13/app/libs/tcpdf/examples/example_061.php
	cake13/app/libs/tcpdf/examples/example_062.php
	cake13/app/libs/tcpdf/examples/example_063.php
	cake13/app/libs/tcpdf/examples/example_064.php
	cake13/app/libs/tcpdf/examples/example_065.php
	cake13/app/libs/tcpdf/examples/index.php
	cake13/app/libs/tcpdf/fonts/aealarabiya.php
	cake13/app/libs/tcpdf/fonts/aefurat.php
	cake13/app/libs/tcpdf/fonts/cid0cs.php
	cake13/app/libs/tcpdf/fonts/cid0ct.php
	cake13/app/libs/tcpdf/fonts/cid0jp.php
	cake13/app/libs/tcpdf/fonts/cid0kr.php
	cake13/app/libs/tcpdf/fonts/courier.php
	cake13/app/libs/tcpdf/fonts/courierb.php
	cake13/app/libs/tcpdf/fonts/courierbi.php
	cake13/app/libs/tcpdf/fonts/courieri.php
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
	cake13/app/libs/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
	cake13/app/libs/tcpdf/fonts/dejavusans.php
	cake13/app/libs/tcpdf/fonts/dejavusansb.php
	cake13/app/libs/tcpdf/fonts/dejavusansbi.php
	cake13/app/libs/tcpdf/fonts/dejavusanscondensed.php
	cake13/app/libs/tcpdf/fonts/dejavusanscondensedb.php
	cake13/app/libs/tcpdf/fonts/dejavusanscondensedbi.php
	cake13/app/libs/tcpdf/fonts/dejavusanscondensedi.php
	cake13/app/libs/tcpdf/fonts/dejavusansextralight.php
	cake13/app/libs/tcpdf/fonts/dejavusansi.php
	cake13/app/libs/tcpdf/fonts/dejavusansmono.php
	cake13/app/libs/tcpdf/fonts/dejavusansmonob.php
	cake13/app/libs/tcpdf/fonts/dejavusansmonobi.php
	cake13/app/libs/tcpdf/fonts/dejavusansmonoi.php
	cake13/app/libs/tcpdf/fonts/dejavuserif.php
	cake13/app/libs/tcpdf/fonts/dejavuserifb.php
	cake13/app/libs/tcpdf/fonts/dejavuserifbi.php
	cake13/app/libs/tcpdf/fonts/dejavuserifcondensed.php
	cake13/app/libs/tcpdf/fonts/dejavuserifcondensedb.php
	cake13/app/libs/tcpdf/fonts/dejavuserifcondensedbi.php
	cake13/app/libs/tcpdf/fonts/dejavuserifcondensedi.php
	cake13/app/libs/tcpdf/fonts/dejavuserifi.php
	cake13/app/libs/tcpdf/fonts/freefont-20100919/AUTHORS
	cake13/app/libs/tcpdf/fonts/freefont-20100919/COPYING
	cake13/app/libs/tcpdf/fonts/freefont-20100919/ChangeLog
	cake13/app/libs/tcpdf/fonts/freefont-20100919/INSTALL
	cake13/app/libs/tcpdf/fonts/freefont-20100919/README
	cake13/app/libs/tcpdf/fonts/freemono.php
	cake13/app/libs/tcpdf/fonts/freemonob.php
	cake13/app/libs/tcpdf/fonts/freemonobi.php
	cake13/app/libs/tcpdf/fonts/freemonoi.php
	cake13/app/libs/tcpdf/fonts/freesans.php
	cake13/app/libs/tcpdf/fonts/freesansb.php
	cake13/app/libs/tcpdf/fonts/freesansbi.php
	cake13/app/libs/tcpdf/fonts/freesansi.php
	cake13/app/libs/tcpdf/fonts/freeserif.php
	cake13/app/libs/tcpdf/fonts/freeserifb.php
	cake13/app/libs/tcpdf/fonts/freeserifbi.php
	cake13/app/libs/tcpdf/fonts/freeserifi.php
	cake13/app/libs/tcpdf/fonts/helvetica.php
	cake13/app/libs/tcpdf/fonts/helveticab.php
	cake13/app/libs/tcpdf/fonts/helveticabi.php
	cake13/app/libs/tcpdf/fonts/helveticai.php
	cake13/app/libs/tcpdf/fonts/hysmyeongjostdmedium.php
	cake13/app/libs/tcpdf/fonts/ipag.php
	cake13/app/libs/tcpdf/fonts/ipagp.php
	cake13/app/libs/tcpdf/fonts/ipam.php
	cake13/app/libs/tcpdf/fonts/ipamp.ctg.z
	cake13/app/libs/tcpdf/fonts/ipamp.php
	cake13/app/libs/tcpdf/fonts/ipamp.z
	cake13/app/libs/tcpdf/fonts/kozgopromedium.php
	cake13/app/libs/tcpdf/fonts/kozminproregular.php
	cake13/app/libs/tcpdf/fonts/msungstdlight.php
	cake13/app/libs/tcpdf/fonts/pdfacourier.php
	cake13/app/libs/tcpdf/fonts/pdfacourierb.php
	cake13/app/libs/tcpdf/fonts/pdfacourierbi.php
	cake13/app/libs/tcpdf/fonts/pdfacourieri.php
	cake13/app/libs/tcpdf/fonts/pdfahelvetica.php
	cake13/app/libs/tcpdf/fonts/pdfahelveticab.php
	cake13/app/libs/tcpdf/fonts/pdfahelveticabi.php
	cake13/app/libs/tcpdf/fonts/pdfahelveticai.php
	cake13/app/libs/tcpdf/fonts/pdfasymbol.php
	cake13/app/libs/tcpdf/fonts/pdfatimes.php
	cake13/app/libs/tcpdf/fonts/pdfatimesb.php
	cake13/app/libs/tcpdf/fonts/pdfatimesbi.php
	cake13/app/libs/tcpdf/fonts/pdfatimesi.php
	cake13/app/libs/tcpdf/fonts/pdfazapfdingbats.php
	cake13/app/libs/tcpdf/fonts/stsongstdlight.php
	cake13/app/libs/tcpdf/fonts/symbol.php
	cake13/app/libs/tcpdf/fonts/times.php
	cake13/app/libs/tcpdf/fonts/timesb.php
	cake13/app/libs/tcpdf/fonts/timesbi.php
	cake13/app/libs/tcpdf/fonts/timesi.php
	cake13/app/libs/tcpdf/fonts/uni2cid_ac15.php
	cake13/app/libs/tcpdf/fonts/uni2cid_ag15.php
	cake13/app/libs/tcpdf/fonts/uni2cid_aj16.php
	cake13/app/libs/tcpdf/fonts/uni2cid_ak12.php
	cake13/app/libs/tcpdf/fonts/zapfdingbats.php
	cake13/app/libs/tcpdf/htmlcolors.php
	cake13/app/libs/tcpdf/images/bug.eps
	cake13/app/libs/tcpdf/images/pelican.ai
	cake13/app/libs/tcpdf/images/testsvg.svg
	cake13/app/libs/tcpdf/images/tiger.ai
	cake13/app/libs/tcpdf/images/tux.svg
	cake13/app/libs/tcpdf/pdf417.php
	cake13/app/libs/tcpdf/qrcode.php
	cake13/app/libs/tcpdf/spotcolors.php
	cake13/app/libs/tcpdf/tcpdf.crt
	cake13/app/libs/tcpdf/tcpdf.php
	cake13/app/libs/tcpdf/tcpdf_filters.php
	cake13/app/libs/tcpdf/tcpdf_parser.php
	cake13/app/libs/tcpdf/unicode_data.php
	cake13/app/webroot/pdf/image/PDF2jpg.bat
	cake13/cake/console/cake.bat
	cake13/cake/tests/test_app/plugins/test_plugin/config/load.php
	cake13/cake/tests/test_app/plugins/test_plugin/config/more.load.php
Merge branch 'master' of https://github.com/frient/htdocs
update
Merge branch 'master' of https://github.com/frient/htdocs

Conflicts:
	analytics/EnkarzAnalyzer.js
	analytics/debug.txt
	analytics/index.html
update