new file:   php.ini
Google AppEngine version
	renamed:    slashquery/php.ini -> php.ini
	deleted:    README.md
	deleted:    dalmpCache/.gitignore
	deleted:    help/help.txt
	deleted:    help/nginx-virtualhost-no-pages-cache.conf
	deleted:    help/nginx-virtualhost-with-upload_module.conf
	deleted:    help/nginx-virtualhost.conf
	deleted:    logs/.gitignore
	modified:   .gitignore
	new file:   app.yaml.dist
	modified:   app.yaml.dist
	renamed:    check-Dependencies.php -> check.php
	modified:   .gitignore
	modified:   check.php
	new file:   README.md
	modified:   index.php
	modified:   slashquery/index.php
	modified:   slashquery/index.php
Merge branch 'appengine' of github.com:nbari/slashquery into appengine

Conflicts:
	slashquery/index.php
Merge branch 'appengine'

Conflicts:
	.gitignore
	help/nginx-virtualhost-no-pages-cache.conf
	help/nginx-virtualhost-with-upload_module.conf
	help/nginx-virtualhost.conf

	modified:   .gitignore
	deleted:    .gitmodules
	modified:   README.md
	new file:   app.yaml.dist
	renamed:    check-Dependencies.php -> check.php
	deleted:    dalmpCache/.gitignore
	deleted:    help/help.txt
	deleted:    html/slashquery/core/vendor/dalmp
	deleted:    html/slashquery/core/vendor/swiftmailer
	deleted:    logs/.gitignore
	new file:   php.ini
	renamed:    html/error/404.html -> slashquery/error/404.html
	renamed:    html/error/50x.html -> slashquery/error/50x.html
	renamed:    html/favicon.ico -> slashquery/favicon.ico
	renamed:    html/index.php -> slashquery/index.php
	renamed:    html/public/default/public.php -> slashquery/public/default/public.php
	renamed:    html/robots.txt -> slashquery/robots.txt
	renamed:    html/slashquery/config.php.sample -> slashquery/slashquery/config.php.sample
	renamed:    html/slashquery/core/classes/class.coreACL.php -> slashquery/slashquery/core/classes/class.coreACL.php
	renamed:    html/slashquery/core/classes/class.coreUser.php -> slashquery/slashquery/core/classes/class.coreUser.php
	renamed:    html/slashquery/core/classes/class.sqACL.php -> slashquery/slashquery/core/classes/class.sqACL.php
	renamed:    html/slashquery/core/classes/class.sqAES.php -> slashquery/slashquery/core/classes/class.sqAES.php
	renamed:    html/slashquery/core/classes/class.sqAbuse.php -> slashquery/slashquery/core/classes/class.sqAbuse.php
	renamed:    html/slashquery/core/classes/class.sqArray.php -> slashquery/slashquery/core/classes/class.sqArray.php
	renamed:    html/slashquery/core/classes/class.sqAuth.php -> slashquery/slashquery/core/classes/class.sqAuth.php
	renamed:    html/slashquery/core/classes/class.sqAutoload.php -> slashquery/slashquery/core/classes/class.sqAutoload.php
	renamed:    html/slashquery/core/classes/class.sqBase.php -> slashquery/slashquery/core/classes/class.sqBase.php
	renamed:    html/slashquery/core/classes/class.sqCaptcha.php -> slashquery/slashquery/core/classes/class.sqCaptcha.php
	renamed:    html/slashquery/core/classes/class.sqCookies.php -> slashquery/slashquery/core/classes/class.sqCookies.php
	renamed:    html/slashquery/core/classes/class.sqDI.php -> slashquery/slashquery/core/classes/class.sqDI.php
	renamed:    html/slashquery/core/classes/class.sqDispatcher.php -> slashquery/slashquery/core/classes/class.sqDispatcher.php
	renamed:    html/slashquery/core/classes/class.sqFactory.php -> slashquery/slashquery/core/classes/class.sqFactory.php
	renamed:    html/slashquery/core/classes/class.sqFinalCommand.php -> slashquery/slashquery/core/classes/class.sqFinalCommand.php
	renamed:    html/slashquery/core/classes/class.sqFinalRule.php -> slashquery/slashquery/core/classes/class.sqFinalRule.php
	renamed:    html/slashquery/core/classes/class.sqLocale.php -> slashquery/slashquery/core/classes/class.sqLocale.php
	renamed:    html/slashquery/core/classes/class.sqLogger.php -> slashquery/slashquery/core/classes/class.sqLogger.php
	renamed:    html/slashquery/core/classes/class.sqMPLT.php -> slashquery/slashquery/core/classes/class.sqMPLT.php
	renamed:    html/slashquery/core/classes/class.sqMail.php -> slashquery/slashquery/core/classes/class.sqMail.php
	renamed:    html/slashquery/core/classes/class.sqOpenID.php -> slashquery/slashquery/core/classes/class.sqOpenID.php
	renamed:    html/slashquery/core/classes/class.sqRouter.php -> slashquery/slashquery/core/classes/class.sqRouter.php
	renamed:    html/slashquery/core/classes/class.sqSSL.php -> slashquery/slashquery/core/classes/class.sqSSL.php
	renamed:    html/slashquery/core/classes/class.sqSession.php -> slashquery/slashquery/core/classes/class.sqSession.php
	renamed:    html/slashquery/core/classes/class.sqSite.php -> slashquery/slashquery/core/classes/class.sqSite.php
	renamed:    html/slashquery/core/classes/class.sqSites.php -> slashquery/slashquery/core/classes/class.sqSites.php
	renamed:    html/slashquery/core/classes/class.sqSubject.php -> slashquery/slashquery/core/classes/class.sqSubject.php
	renamed:    html/slashquery/core/classes/class.sqTPL.php -> slashquery/slashquery/core/classes/class.sqTPL.php
	renamed:    html/slashquery/core/classes/class.sqTools.php -> slashquery/slashquery/core/classes/class.sqTools.php
	renamed:    html/slashquery/core/classes/class.sqView.php -> slashquery/slashquery/core/classes/class.sqView.php
	renamed:    html/slashquery/core/classes/class.sqi18n.php -> slashquery/slashquery/core/classes/class.sqi18n.php
	renamed:    html/slashquery/core/include/error_handler.php -> slashquery/slashquery/core/include/error_handler.php
	renamed:    html/slashquery/core/locale/en/en.php -> slashquery/slashquery/core/locale/en/en.php
	renamed:    html/slashquery/core/modules/ACL/ACL.php -> slashquery/slashquery/core/modules/ACL/ACL.php
	renamed:    html/slashquery/core/modules/ACL/ACL_module.php -> slashquery/slashquery/core/modules/ACL/ACL_module.php
	renamed:    html/slashquery/core/modules/ACL/commands/class.default.php -> slashquery/slashquery/core/modules/ACL/commands/class.default.php
	renamed:    html/slashquery/core/modules/ACL/commands/class.modules.php -> slashquery/slashquery/core/modules/ACL/commands/class.modules.php
	renamed:    html/slashquery/core/modules/ACL/commands/class.permissions.php -> slashquery/slashquery/core/modules/ACL/commands/class.permissions.php
	renamed:    html/slashquery/core/modules/ACL/commands/class.roles.php -> slashquery/slashquery/core/modules/ACL/commands/class.roles.php
	renamed:    html/slashquery/core/modules/ACL/rules/class.addRole.php -> slashquery/slashquery/core/modules/ACL/rules/class.addRole.php
	renamed:    html/slashquery/core/modules/ACL/rules/class.checkRole.php -> slashquery/slashquery/core/modules/ACL/rules/class.checkRole.php
	renamed:    html/slashquery/core/modules/ACL/rules/class.delRole.php -> slashquery/slashquery/core/modules/ACL/rules/class.delRole.php
	renamed:    html/slashquery/core/modules/ACL/rules/class.status.php -> slashquery/slashquery/core/modules/ACL/rules/class.status.php
	renamed:    html/slashquery/core/modules/configuration/commands/class.abusedb.php -> slashquery/slashquery/core/modules/configuration/commands/class.abusedb.php
	renamed:    html/slashquery/core/modules/configuration/commands/class.backup.php -> slashquery/slashquery/core/modules/configuration/commands/class.backup.php
	renamed:    html/slashquery/core/modules/configuration/commands/class.cache.php -> slashquery/slashquery/core/modules/configuration/commands/class.cache.php
	renamed:    html/slashquery/core/modules/configuration/commands/class.database.php -> slashquery/slashquery/core/modules/configuration/commands/class.database.php
	renamed:    html/slashquery/core/modules/configuration/commands/class.default.php -> slashquery/slashquery/core/modules/configuration/commands/class.default.php
	renamed:    html/slashquery/core/modules/configuration/commands/class.languages.php -> slashquery/slashquery/core/modules/configuration/commands/class.languages.php
	renamed:    html/slashquery/core/modules/configuration/configuration.php -> slashquery/slashquery/core/modules/configuration/configuration.php
	renamed:    html/slashquery/core/modules/configuration/configuration_module.php -> slashquery/slashquery/core/modules/configuration/configuration_module.php
	renamed:    html/slashquery/core/modules/configuration/rules/class.backup.php -> slashquery/slashquery/core/modules/configuration/rules/class.backup.php
	renamed:    html/slashquery/core/modules/configuration/rules/class.createLocale.php -> slashquery/slashquery/core/modules/configuration/rules/class.createLocale.php
	renamed:    html/slashquery/core/modules/configuration/rules/class.deleteAbuse.php -> slashquery/slashquery/core/modules/configuration/rules/class.deleteAbuse.php
	renamed:    html/slashquery/core/modules/configuration/rules/class.deleteAbuseID.php -> slashquery/slashquery/core/modules/configuration/rules/class.deleteAbuseID.php
	renamed:    html/slashquery/core/modules/configuration/rules/class.flushCache.php -> slashquery/slashquery/core/modules/configuration/rules/class.flushCache.php
	renamed:    html/slashquery/core/modules/configuration/rules/class.optimizeDB.php -> slashquery/slashquery/core/modules/configuration/rules/class.optimizeDB.php
	renamed:    html/slashquery/core/modules/configuration/rules/class.rmLocale.php -> slashquery/slashquery/core/modules/configuration/rules/class.rmLocale.php
	renamed:    html/slashquery/core/modules/cpanel/commands/class.default.php -> slashquery/slashquery/core/modules/cpanel/commands/class.default.php
	renamed:    html/slashquery/core/modules/cpanel/commands/class.exit.php -> slashquery/slashquery/core/modules/cpanel/commands/class.exit.php
	renamed:    html/slashquery/core/modules/cpanel/commands/class.uopenid.php -> slashquery/slashquery/core/modules/cpanel/commands/class.uopenid.php
	renamed:    html/slashquery/core/modules/cpanel/commands/class.user.php -> slashquery/slashquery/core/modules/cpanel/commands/class.user.php
	renamed:    html/slashquery/core/modules/cpanel/cpanel.php -> slashquery/slashquery/core/modules/cpanel/cpanel.php
	renamed:    html/slashquery/core/modules/cpanel/cpanel_module.php -> slashquery/slashquery/core/modules/cpanel/cpanel_module.php
	renamed:    html/slashquery/core/modules/cpanel/rules/class.changeDetails.php -> slashquery/slashquery/core/modules/cpanel/rules/class.changeDetails.php
	renamed:    html/slashquery/core/modules/cpanel/rules/class.changePassword.php -> slashquery/slashquery/core/modules/cpanel/rules/class.changePassword.php
	renamed:    html/slashquery/core/modules/cpanel/rules/class.checkOpenID.php -> slashquery/slashquery/core/modules/cpanel/rules/class.checkOpenID.php
	renamed:    html/slashquery/core/modules/cpanel/rules/class.delOpenID.php -> slashquery/slashquery/core/modules/cpanel/rules/class.delOpenID.php
	renamed:    html/slashquery/core/modules/cpanel/rules/class.resetPassword.php -> slashquery/slashquery/core/modules/cpanel/rules/class.resetPassword.php
	renamed:    html/slashquery/core/modules/cpanel/rules/class.signIn.php -> slashquery/slashquery/core/modules/cpanel/rules/class.signIn.php
	renamed:    html/slashquery/core/modules/news/commands/class.default.php -> slashquery/slashquery/core/modules/news/commands/class.default.php
	renamed:    html/slashquery/core/modules/news/commands/class.exit.php -> slashquery/slashquery/core/modules/news/commands/class.exit.php
	renamed:    html/slashquery/core/modules/news/news.php -> slashquery/slashquery/core/modules/news/news.php
	renamed:    html/slashquery/core/modules/news/news_module.php -> slashquery/slashquery/core/modules/news/news_module.php
	renamed:    html/slashquery/core/modules/news/news_sites.php -> slashquery/slashquery/core/modules/news/news_sites.php
	renamed:    html/slashquery/core/modules/users/commands/class.add.php -> slashquery/slashquery/core/modules/users/commands/class.add.php
	renamed:    html/slashquery/core/modules/users/commands/class.default.php -> slashquery/slashquery/core/modules/users/commands/class.default.php
	renamed:    html/slashquery/core/modules/users/commands/class.edit.php -> slashquery/slashquery/core/modules/users/commands/class.edit.php
	renamed:    html/slashquery/core/modules/users/rules/class.addUser.php -> slashquery/slashquery/core/modules/users/rules/class.addUser.php
	renamed:    html/slashquery/core/modules/users/rules/class.checkEmail.php -> slashquery/slashquery/core/modules/users/rules/class.checkEmail.php
	renamed:    html/slashquery/core/modules/users/rules/class.checkOpenID.php -> slashquery/slashquery/core/modules/users/rules/class.checkOpenID.php
	renamed:    html/slashquery/core/modules/users/rules/class.delUser.php -> slashquery/slashquery/core/modules/users/rules/class.delUser.php
	renamed:    html/slashquery/core/modules/users/rules/class.editUser.php -> slashquery/slashquery/core/modules/users/rules/class.editUser.php
	renamed:    html/slashquery/core/modules/users/rules/class.pagination.php -> slashquery/slashquery/core/modules/users/rules/class.pagination.php
	renamed:    html/slashquery/core/modules/users/users.php -> slashquery/slashquery/core/modules/users/users.php
	renamed:    html/slashquery/core/modules/users/users_module.php -> slashquery/slashquery/core/modules/users/users_module.php
	renamed:    html/slashquery/core/templates/cpanel/base.tpl -> slashquery/slashquery/core/templates/cpanel/base.tpl
	renamed:    html/slashquery/core/templates/cpanel/css/bootstrap-responsive.min.css -> slashquery/slashquery/core/templates/cpanel/css/bootstrap-responsive.min.css
	renamed:    html/slashquery/core/templates/cpanel/css/bootstrap.min.css -> slashquery/slashquery/core/templates/cpanel/css/bootstrap.min.css
	renamed:    html/slashquery/core/templates/cpanel/css/custom.css -> slashquery/slashquery/core/templates/cpanel/css/custom.css
	renamed:    html/slashquery/core/templates/cpanel/errors/accessDenied.tpl -> slashquery/slashquery/core/templates/cpanel/errors/accessDenied.tpl
	renamed:    html/slashquery/core/templates/cpanel/errors/moduleDisabled.tpl -> slashquery/slashquery/core/templates/cpanel/errors/moduleDisabled.tpl
	renamed:    html/slashquery/core/templates/cpanel/footer.tpl -> slashquery/slashquery/core/templates/cpanel/footer.tpl
	renamed:    html/slashquery/core/templates/cpanel/header.tpl -> slashquery/slashquery/core/templates/cpanel/header.tpl
	renamed:    html/slashquery/core/templates/cpanel/img/ajax-loading.gif -> slashquery/slashquery/core/templates/cpanel/img/ajax-loading.gif
	renamed:    html/slashquery/core/templates/cpanel/img/ajax-mac.gif -> slashquery/slashquery/core/templates/cpanel/img/ajax-mac.gif
	renamed:    html/slashquery/core/templates/cpanel/img/glyphicons-halflings-white.png -> slashquery/slashquery/core/templates/cpanel/img/glyphicons-halflings-white.png
	renamed:    html/slashquery/core/templates/cpanel/img/glyphicons-halflings.png -> slashquery/slashquery/core/templates/cpanel/img/glyphicons-halflings.png
	renamed:    html/slashquery/core/templates/cpanel/img/logo-sq.png -> slashquery/slashquery/core/templates/cpanel/img/logo-sq.png
	renamed:    html/slashquery/core/templates/cpanel/img/openid13.png -> slashquery/slashquery/core/templates/cpanel/img/openid13.png
	renamed:    html/slashquery/core/templates/cpanel/img/status0.png -> slashquery/slashquery/core/templates/cpanel/img/status0.png
	renamed:    html/slashquery/core/templates/cpanel/img/status1.png -> slashquery/slashquery/core/templates/cpanel/img/status1.png
	renamed:    html/slashquery/core/templates/cpanel/js/cabuse.js -> slashquery/slashquery/core/templates/cpanel/js/cabuse.js
	renamed:    html/slashquery/core/templates/cpanel/js/cbackup.js -> slashquery/slashquery/core/templates/cpanel/js/cbackup.js
	renamed:    html/slashquery/core/templates/cpanel/js/cdatabase.js -> slashquery/slashquery/core/templates/cpanel/js/cdatabase.js
	renamed:    html/slashquery/core/templates/cpanel/js/cflushCache.js -> slashquery/slashquery/core/templates/cpanel/js/cflushCache.js
	renamed:    html/slashquery/core/templates/cpanel/js/clanguages.js -> slashquery/slashquery/core/templates/cpanel/js/clanguages.js
	renamed:    html/slashquery/core/templates/cpanel/js/login.js -> slashquery/slashquery/core/templates/cpanel/js/login.js
	renamed:    html/slashquery/core/templates/cpanel/js/manage_users.gz.js -> slashquery/slashquery/core/templates/cpanel/js/manage_users.gz.js
	renamed:    html/slashquery/core/templates/cpanel/js/modules.js -> slashquery/slashquery/core/templates/cpanel/js/modules.js
	renamed:    html/slashquery/core/templates/cpanel/js/mypaginator.gz.js -> slashquery/slashquery/core/templates/cpanel/js/mypaginator.gz.js
	renamed:    html/slashquery/core/templates/cpanel/js/permissions.js -> slashquery/slashquery/core/templates/cpanel/js/permissions.js
	renamed:    html/slashquery/core/templates/cpanel/js/plugins.js -> slashquery/slashquery/core/templates/cpanel/js/plugins.js
	renamed:    html/slashquery/core/templates/cpanel/js/roles.js -> slashquery/slashquery/core/templates/cpanel/js/roles.js
	renamed:    html/slashquery/core/templates/cpanel/js/uopenid.js -> slashquery/slashquery/core/templates/cpanel/js/uopenid.js
	renamed:    html/slashquery/core/templates/cpanel/js/userAdd.js -> slashquery/slashquery/core/templates/cpanel/js/userAdd.js
	renamed:    html/slashquery/core/templates/cpanel/js/userDetails.js -> slashquery/slashquery/core/templates/cpanel/js/userDetails.js
	renamed:    html/slashquery/core/templates/cpanel/js/userEdit.js -> slashquery/slashquery/core/templates/cpanel/js/userEdit.js
	renamed:    html/slashquery/core/templates/cpanel/js/users.js -> slashquery/slashquery/core/templates/cpanel/js/users.js
	renamed:    html/slashquery/core/templates/cpanel/js/vendor/bootstrap.min.js -> slashquery/slashquery/core/templates/cpanel/js/vendor/bootstrap.min.js
	renamed:    html/slashquery/core/templates/cpanel/js/vendor/gibberish-aes.min.js -> slashquery/slashquery/core/templates/cpanel/js/vendor/gibberish-aes.min.js
	renamed:    html/slashquery/core/templates/cpanel/js/vendor/jquery-1.9.0.min.js -> slashquery/slashquery/core/templates/cpanel/js/vendor/jquery-1.9.0.min.js
	renamed:    html/slashquery/core/templates/cpanel/js/vendor/jquery.blockUI.js -> slashquery/slashquery/core/templates/cpanel/js/vendor/jquery.blockUI.js
	renamed:    html/slashquery/core/templates/cpanel/js/vendor/jquery.sha1.js -> slashquery/slashquery/core/templates/cpanel/js/vendor/jquery.sha1.js
	renamed:    html/slashquery/core/templates/cpanel/js/vendor/jquery.validate.min.js -> slashquery/slashquery/core/templates/cpanel/js/vendor/jquery.validate.min.js
	renamed:    html/slashquery/core/templates/cpanel/js/vendor/modernizr-2.6.2.min.js -> slashquery/slashquery/core/templates/cpanel/js/vendor/modernizr-2.6.2.min.js
	renamed:    html/slashquery/core/templates/cpanel/login.tpl -> slashquery/slashquery/core/templates/cpanel/login.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/ACL/ACL.tpl -> slashquery/slashquery/core/templates/cpanel/modules/ACL/ACL.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/ACL/default.tpl -> slashquery/slashquery/core/templates/cpanel/modules/ACL/default.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/ACL/modules.tpl -> slashquery/slashquery/core/templates/cpanel/modules/ACL/modules.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/ACL/permissions-default.tpl -> slashquery/slashquery/core/templates/cpanel/modules/ACL/permissions-default.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/ACL/permissions.tpl -> slashquery/slashquery/core/templates/cpanel/modules/ACL/permissions.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/ACL/roles.tpl -> slashquery/slashquery/core/templates/cpanel/modules/ACL/roles.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/configuration/abusedb.tpl -> slashquery/slashquery/core/templates/cpanel/modules/configuration/abusedb.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/configuration/backup.tpl -> slashquery/slashquery/core/templates/cpanel/modules/configuration/backup.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/configuration/cache.tpl -> slashquery/slashquery/core/templates/cpanel/modules/configuration/cache.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/configuration/configuration.tpl -> slashquery/slashquery/core/templates/cpanel/modules/configuration/configuration.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/configuration/database.tpl -> slashquery/slashquery/core/templates/cpanel/modules/configuration/database.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/configuration/default.tpl -> slashquery/slashquery/core/templates/cpanel/modules/configuration/default.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/configuration/languages.tpl -> slashquery/slashquery/core/templates/cpanel/modules/configuration/languages.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/cpanel/cpanel.tpl -> slashquery/slashquery/core/templates/cpanel/modules/cpanel/cpanel.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/cpanel/openid.tpl -> slashquery/slashquery/core/templates/cpanel/modules/cpanel/openid.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/cpanel/user.tpl -> slashquery/slashquery/core/templates/cpanel/modules/cpanel/user.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/news/news.tpl -> slashquery/slashquery/core/templates/cpanel/modules/news/news.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/users/add.tpl -> slashquery/slashquery/core/templates/cpanel/modules/users/add.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/users/edit.tpl -> slashquery/slashquery/core/templates/cpanel/modules/users/edit.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/users/users.tpl -> slashquery/slashquery/core/templates/cpanel/modules/users/users.tpl
	renamed:    html/slashquery/core/templates/cpanel/modules/users/view.tpl -> slashquery/slashquery/core/templates/cpanel/modules/users/view.tpl
	renamed:    html/slashquery/core/vendor/jsmin/jsmin.php -> slashquery/slashquery/core/vendor/jsmin/jsmin.php
	renamed:    html/slashquery/core/vendor/jsmin/test/.gitignore -> slashquery/slashquery/core/vendor/jsmin/test/.gitignore
	renamed:    html/slashquery/core/vendor/jsmin/test/jsmin.c -> slashquery/slashquery/core/vendor/jsmin/test/jsmin.c
	renamed:    html/slashquery/core/vendor/jsmin/test/setup.php -> slashquery/slashquery/core/vendor/jsmin/test/setup.php
	renamed:    html/slashquery/core/vendor/jsmin/test/test.php -> slashquery/slashquery/core/vendor/jsmin/test/test.php
	renamed:    html/slashquery/core/vendor/recaptcha/LICENSE -> slashquery/slashquery/core/vendor/recaptcha/LICENSE
	renamed:    html/slashquery/core/vendor/recaptcha/README -> slashquery/slashquery/core/vendor/recaptcha/README
	renamed:    html/slashquery/core/vendor/recaptcha/example-captcha.php -> slashquery/slashquery/core/vendor/recaptcha/example-captcha.php
	renamed:    html/slashquery/core/vendor/recaptcha/example-mailhide.php -> slashquery/slashquery/core/vendor/recaptcha/example-mailhide.php
	renamed:    html/slashquery/core/vendor/recaptcha/recaptchalib.php -> slashquery/slashquery/core/vendor/recaptcha/recaptchalib.php
	renamed:    html/slashquery/sites.php.sample -> slashquery/slashquery/sites.php.sample
	renamed:    html/slashquery/sites/default/classes/README.md -> slashquery/slashquery/sites/default/classes/README.md
	renamed:    html/slashquery/sites/default/classes/class.mySharedClass.php -> slashquery/slashquery/sites/default/classes/class.mySharedClass.php
	renamed:    html/slashquery/sites/default/cleanDB.php -> slashquery/slashquery/sites/default/cleanDB.php
	renamed:    html/slashquery/sites/default/config.php.sample -> slashquery/slashquery/sites/default/config.php.sample
	renamed:    html/slashquery/sites/default/cpanel/myNews/commands/class.default.php -> slashquery/slashquery/sites/default/cpanel/myNews/commands/class.default.php
	renamed:    html/slashquery/sites/default/cpanel/myNews/commands/class.exit.php -> slashquery/slashquery/sites/default/cpanel/myNews/commands/class.exit.php
	renamed:    html/slashquery/sites/default/cpanel/myNews/myNews.php -> slashquery/slashquery/sites/default/cpanel/myNews/myNews.php
	renamed:    html/slashquery/sites/default/cpanel/myNews/myNews_module.php -> slashquery/slashquery/sites/default/cpanel/myNews/myNews_module.php
	renamed:    html/slashquery/sites/default/cpanel/myNews/templates/modules/myNews/create.tpl -> slashquery/slashquery/sites/default/cpanel/myNews/templates/modules/myNews/create.tpl
	renamed:    html/slashquery/sites/default/cpanel/myNews/templates/modules/myNews/myNews.tpl -> slashquery/slashquery/sites/default/cpanel/myNews/templates/modules/myNews/myNews.tpl
	renamed:    html/slashquery/sites/default/cpanel/myNews/templates/modules/myNews/null.tpl -> slashquery/slashquery/sites/default/cpanel/myNews/templates/modules/myNews/null.tpl
	renamed:    html/slashquery/sites/default/cpanel/upload/commands/class.create.php -> slashquery/slashquery/sites/default/cpanel/upload/commands/class.create.php
	renamed:    html/slashquery/sites/default/cpanel/upload/commands/class.default.php -> slashquery/slashquery/sites/default/cpanel/upload/commands/class.default.php
	renamed:    html/slashquery/sites/default/cpanel/upload/commands/class.exit.php -> slashquery/slashquery/sites/default/cpanel/upload/commands/class.exit.php
	renamed:    html/slashquery/sites/default/cpanel/upload/rules/class.ping.php -> slashquery/slashquery/sites/default/cpanel/upload/rules/class.ping.php
	renamed:    html/slashquery/sites/default/cpanel/upload/rules/class.upload.php -> slashquery/slashquery/sites/default/cpanel/upload/rules/class.upload.php
	renamed:    html/slashquery/sites/default/cpanel/upload/templates/css/bootstrap-fileupload.min.css -> slashquery/slashquery/sites/default/cpanel/upload/templates/css/bootstrap-fileupload.min.css
	renamed:    html/slashquery/sites/default/cpanel/upload/templates/js/main.js -> slashquery/slashquery/sites/default/cpanel/upload/templates/js/main.js
	renamed:    html/slashquery/sites/default/cpanel/upload/templates/js/upload.js -> slashquery/slashquery/sites/default/cpanel/upload/templates/js/upload.js
	renamed:    html/slashquery/sites/default/cpanel/upload/templates/js/vendor/bootstrap-fileupload.min.js -> slashquery/slashquery/sites/default/cpanel/upload/templates/js/vendor/bootstrap-fileupload.min.js
	renamed:    html/slashquery/sites/default/cpanel/upload/templates/modules/upload/create.tpl -> slashquery/slashquery/sites/default/cpanel/upload/templates/modules/upload/create.tpl
	renamed:    html/slashquery/sites/default/cpanel/upload/templates/modules/upload/null.tpl -> slashquery/slashquery/sites/default/cpanel/upload/templates/modules/upload/null.tpl
	renamed:    html/slashquery/sites/default/cpanel/upload/templates/modules/upload/upload.tpl -> slashquery/slashquery/sites/default/cpanel/upload/templates/modules/upload/upload.tpl
	renamed:    html/slashquery/sites/default/cpanel/upload/upload.php -> slashquery/slashquery/sites/default/cpanel/upload/upload.php
	renamed:    html/slashquery/sites/default/cpanel/upload/upload_module.php -> slashquery/slashquery/sites/default/cpanel/upload/upload_module.php
	renamed:    html/slashquery/sites/default/include/README.md -> slashquery/slashquery/sites/default/include/README.md
	renamed:    html/slashquery/sites/default/include/functions.php -> slashquery/slashquery/sites/default/include/functions.php
	renamed:    html/slashquery/sites/default/locale/en/en.php -> slashquery/slashquery/sites/default/locale/en/en.php
	renamed:    html/slashquery/sites/default/modules/main/commands/class.default.php -> slashquery/slashquery/sites/default/modules/main/commands/class.default.php
	renamed:    html/slashquery/sites/default/modules/main/commands/class.exit.php -> slashquery/slashquery/sites/default/modules/main/commands/class.exit.php
	renamed:    html/slashquery/sites/default/modules/main/main.php -> slashquery/slashquery/sites/default/modules/main/main.php
	renamed:    html/slashquery/sites/default/modules/main/main_module.php -> slashquery/slashquery/sites/default/modules/main/main_module.php
	renamed:    html/slashquery/sites/default/modules/main/rules/class.example.php -> slashquery/slashquery/sites/default/modules/main/rules/class.example.php
	renamed:    html/slashquery/sites/default/setup.php -> slashquery/slashquery/sites/default/setup.php
	renamed:    html/slashquery/sites/default/templates/default/base.tpl -> slashquery/slashquery/sites/default/templates/default/base.tpl
	renamed:    html/slashquery/sites/default/templates/default/css/fluid24.css -> slashquery/slashquery/sites/default/templates/default/css/fluid24.css
	renamed:    html/slashquery/sites/default/templates/default/css/main.css -> slashquery/slashquery/sites/default/templates/default/css/main.css
	renamed:    html/slashquery/sites/default/templates/default/css/normalize.css -> slashquery/slashquery/sites/default/templates/default/css/normalize.css
	renamed:    html/slashquery/sites/default/templates/default/errors/accessDenied.tpl -> slashquery/slashquery/sites/default/templates/default/errors/accessDenied.tpl
	renamed:    html/slashquery/sites/default/templates/default/errors/moduleDisabled.tpl -> slashquery/slashquery/sites/default/templates/default/errors/moduleDisabled.tpl
	renamed:    html/slashquery/sites/default/templates/default/footer.tpl -> slashquery/slashquery/sites/default/templates/default/footer.tpl
	renamed:    html/slashquery/sites/default/templates/default/header.tpl -> slashquery/slashquery/sites/default/templates/default/header.tpl
	renamed:    html/slashquery/sites/default/templates/default/img/logo-menu.png -> slashquery/slashquery/sites/default/templates/default/img/logo-menu.png
	renamed:    html/slashquery/sites/default/templates/default/img/satinweave.png -> slashquery/slashquery/sites/default/templates/default/img/satinweave.png
	renamed:    html/slashquery/sites/default/templates/default/js/main.js -> slashquery/slashquery/sites/default/templates/default/js/main.js
	renamed:    html/slashquery/sites/default/templates/default/js/plugins.js -> slashquery/slashquery/sites/default/templates/default/js/plugins.js
	renamed:    html/slashquery/sites/default/templates/default/js/vendor/jquery-1.9.0.min.js -> slashquery/slashquery/sites/default/templates/default/js/vendor/jquery-1.9.0.min.js
	renamed:    html/slashquery/sites/default/templates/default/js/vendor/modernizr-2.6.2.min.js -> slashquery/slashquery/sites/default/templates/default/js/vendor/modernizr-2.6.2.min.js
	renamed:    html/slashquery/sites/default/templates/default/modules/main/main.tpl -> slashquery/slashquery/sites/default/templates/default/modules/main/main.tpl
	renamed:    html/slashquery/xx-10-32/NU.php -> slashquery/slashquery/xx-10-32/NU.php
	renamed:    html/slashquery/xx-10-32/RP.php -> slashquery/slashquery/xx-10-32/RP.php
	renamed:    html/slashquery/xx-10-32/switch.php -> slashquery/slashquery/xx-10-32/switch.php
	renamed:    html/slashquery/xx-10-32/templates/NU.tpl -> slashquery/slashquery/xx-10-32/templates/NU.tpl
	renamed:    html/slashquery/xx-10-32/templates/RP.tpl -> slashquery/slashquery/xx-10-32/templates/RP.tpl
	renamed:    html/slashquery/xx-10-32/templates/base.tpl -> slashquery/slashquery/xx-10-32/templates/base.tpl
	renamed:    html/slashquery/xx-10-32/templates/confirmed.tpl -> slashquery/slashquery/xx-10-32/templates/confirmed.tpl
	renamed:    html/slashquery/xx-10-32/templates/css/bootstrap-responsive.min.css -> slashquery/slashquery/xx-10-32/templates/css/bootstrap-responsive.min.css
	renamed:    html/slashquery/xx-10-32/templates/css/bootstrap.min.css -> slashquery/slashquery/xx-10-32/templates/css/bootstrap.min.css
	renamed:    html/slashquery/xx-10-32/templates/css/custom.css -> slashquery/slashquery/xx-10-32/templates/css/custom.css
	renamed:    html/slashquery/xx-10-32/templates/expired.tpl -> slashquery/slashquery/xx-10-32/templates/expired.tpl
	renamed:    html/slashquery/xx-10-32/templates/footer.tpl -> slashquery/slashquery/xx-10-32/templates/footer.tpl
	renamed:    html/slashquery/xx-10-32/templates/footer.tpl-old -> slashquery/slashquery/xx-10-32/templates/footer.tpl-old
	renamed:    html/slashquery/xx-10-32/templates/header.tpl -> slashquery/slashquery/xx-10-32/templates/header.tpl
	renamed:    html/slashquery/xx-10-32/templates/header.tpl-old -> slashquery/slashquery/xx-10-32/templates/header.tpl-old
	renamed:    html/slashquery/xx-10-32/templates/img/ajax-mac.gif -> slashquery/slashquery/xx-10-32/templates/img/ajax-mac.gif
	renamed:    html/slashquery/xx-10-32/templates/img/glyphicons-halflings-white.png -> slashquery/slashquery/xx-10-32/templates/img/glyphicons-halflings-white.png
	renamed:    html/slashquery/xx-10-32/templates/img/glyphicons-halflings.png -> slashquery/slashquery/xx-10-32/templates/img/glyphicons-halflings.png
	renamed:    html/slashquery/xx-10-32/templates/img/logo-sq.png -> slashquery/slashquery/xx-10-32/templates/img/logo-sq.png
	renamed:    html/slashquery/xx-10-32/templates/invalid.tpl -> slashquery/slashquery/xx-10-32/templates/invalid.tpl
	renamed:    html/slashquery/xx-10-32/templates/js-old/RP.gz.js -> slashquery/slashquery/xx-10-32/templates/js-old/RP.gz.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/cbackup.js -> slashquery/slashquery/xx-10-32/templates/js-old/cbackup.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/cdatabase.js -> slashquery/slashquery/xx-10-32/templates/js-old/cdatabase.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/cflushCache.js -> slashquery/slashquery/xx-10-32/templates/js-old/cflushCache.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/clanguages.js -> slashquery/slashquery/xx-10-32/templates/js-old/clanguages.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/common.gz.js -> slashquery/slashquery/xx-10-32/templates/js-old/common.gz.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/jquery.blockUI.min.js -> slashquery/slashquery/xx-10-32/templates/js-old/jquery.blockUI.min.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/login.js -> slashquery/slashquery/xx-10-32/templates/js-old/login.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/manage_users.gz.js -> slashquery/slashquery/xx-10-32/templates/js-old/manage_users.gz.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/modules.js -> slashquery/slashquery/xx-10-32/templates/js-old/modules.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/mypaginator.gz.js -> slashquery/slashquery/xx-10-32/templates/js-old/mypaginator.gz.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/permissions.js -> slashquery/slashquery/xx-10-32/templates/js-old/permissions.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/plugins.js -> slashquery/slashquery/xx-10-32/templates/js-old/plugins.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/roles.js -> slashquery/slashquery/xx-10-32/templates/js-old/roles.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/userAdd.js -> slashquery/slashquery/xx-10-32/templates/js-old/userAdd.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/userEdit.js -> slashquery/slashquery/xx-10-32/templates/js-old/userEdit.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/users.js -> slashquery/slashquery/xx-10-32/templates/js-old/users.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/vendor/bootstrap.min.js -> slashquery/slashquery/xx-10-32/templates/js-old/vendor/bootstrap.min.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/vendor/gibberish-aes.min.js -> slashquery/slashquery/xx-10-32/templates/js-old/vendor/gibberish-aes.min.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/vendor/jquery-1.9.0.min.js -> slashquery/slashquery/xx-10-32/templates/js-old/vendor/jquery-1.9.0.min.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/vendor/jquery.blockUI.js -> slashquery/slashquery/xx-10-32/templates/js-old/vendor/jquery.blockUI.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/vendor/jquery.sha1.js -> slashquery/slashquery/xx-10-32/templates/js-old/vendor/jquery.sha1.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/vendor/jquery.validate.min.js -> slashquery/slashquery/xx-10-32/templates/js-old/vendor/jquery.validate.min.js
	renamed:    html/slashquery/xx-10-32/templates/js-old/vendor/modernizr-2.6.2.min.js -> slashquery/slashquery/xx-10-32/templates/js-old/vendor/modernizr-2.6.2.min.js
	renamed:    html/slashquery/xx-10-32/templates/js/RP.js -> slashquery/slashquery/xx-10-32/templates/js/RP.js
	renamed:    html/slashquery/xx-10-32/templates/js/plugins.js -> slashquery/slashquery/xx-10-32/templates/js/plugins.js
	renamed:    html/slashquery/xx-10-32/templates/js/vendor/bootstrap.min.js -> slashquery/slashquery/xx-10-32/templates/js/vendor/bootstrap.min.js
	renamed:    html/slashquery/xx-10-32/templates/js/vendor/gibberish-aes.min.js -> slashquery/slashquery/xx-10-32/templates/js/vendor/gibberish-aes.min.js
	renamed:    html/slashquery/xx-10-32/templates/js/vendor/jquery-1.9.0.min.js -> slashquery/slashquery/xx-10-32/templates/js/vendor/jquery-1.9.0.min.js
	renamed:    html/slashquery/xx-10-32/templates/js/vendor/jquery.blockUI.js -> slashquery/slashquery/xx-10-32/templates/js/vendor/jquery.blockUI.js
	renamed:    html/slashquery/xx-10-32/templates/js/vendor/jquery.sha1.js -> slashquery/slashquery/xx-10-32/templates/js/vendor/jquery.sha1.js
	renamed:    html/slashquery/xx-10-32/templates/js/vendor/jquery.validate.min.js -> slashquery/slashquery/xx-10-32/templates/js/vendor/jquery.validate.min.js
	renamed:    html/slashquery/xx-10-32/templates/js/vendor/modernizr-2.6.2.min.js -> slashquery/slashquery/xx-10-32/templates/js/vendor/modernizr-2.6.2.min.js
	renamed:    html/sqCompressor.php -> slashquery/sqCompressor.php
	renamed:    html/uploadHandler.php -> slashquery/uploadHandler.php
Merge branch 'master' of github.com:nbari/slashquery