From 04119d31e51c749cfa81b9a8ac5f52005d71f8c4 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 29 May 2012 16:13:27 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning
  MySQL-Fulltext search option is disabled by default
  Disabled logging of SQL statements
  Doing negative caching for config values, special logfile for database optmisations
  Saved searches now can search for tags as well
  Deactivating the test output in db engine
  Speed optimisation by enabling the posibility of the MySQL fulltext engine
  Performance tests
  API: RSS-Feeds are now shortened to 1000 characters. (With added link)

* master: