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