From f1db6907860efcd4f48380bb8c0f88272adb91a8 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 8 Apr 2012 13:49:52 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  prepare for using a master theme_init()
  provide theme_init() functions
  rev updates
  API: API is now enhanced. mentions, repeat and destroy now works.
  "vier": Some design stuff
  "vier": Bookmarks now look better.
  API: template for test function added
  The "vier"-theme is now working again. But there is still work needed
  New script that checks if a script is running
  poller: An optional lockfile is used to check if the poller is already running
  Several improvements

* master: