mv sa/log/ to srv/logging/
added ms/visual-studio.md
Merge branch 'master' of github.com:shuge/man
fixed maatkit deps on debian
added tools/synergy-quick-guide.md
up
added web/django/use-django-haystack-with-norel.md
Merge branch 'master' of github.com:shuge/man

Conflicts:
	sa/log/collect-mysql-log-by-logstash.md
	sa/log/collect-php-log-by-logstash.md
	sa/log/collect-redis-log-by-logstash.md
	sa/log/logstash-quick-guide.md
	sa/log/syslog-ng-quick-guide.md
	srv/log/collect-mysql-log-by-logstash.md
	srv/log/collect-php-log-by-logstash.md
	srv/log/collect-redis-log-by-logstash.md
	srv/log/logstash-quick-guide.md
	srv/log/syslog-ng-quick-guide.md
	srv/logging/collect-mysql-log-by-logstash.md
	srv/logging/collect-php-log-by-logstash.md
	srv/logging/collect-redis-log-by-logstash.md
	srv/logging/logstash-quick-guide.md
	srv/logging/syslog-ng-quick-guide.md
Merged
added srv/sql/mysql/notes-on-mysql-error-1032.md
added web/django/notes-on-django-nonrel-*
added sa/http/install-nginx-gridfs.md
added srv/store/mongodb-installation.md
added srv/search/elasticsearch-http-api.md
clean up