From 6bb8d42865fcd19d17e36252e1d668b1467c1d46 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 28 Mar 2012 05:42:47 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  support autocomplete @-tags in plaintext mode
  vier navbar messed up after default theme template move
  profile_tabs hook
  use theme directory for page templates, not language directory
  turn on gecko spellcheck in tinymce
  small fix in diabook
  fixes in diabook
  provide a close-option for boxes in right_aside and store info via js and cookies
  provide a close-option for boxes in right_aside and store info via js and cookies
  form security error when using existing photo

* master: