From 3c153369840071fd7d5978b37a4c328f1c314564 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 24 May 2012 05:28:40 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  slackr: improve interactivity
  slackr: hide calendar when posting
  more theme stuff

* master: