Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master:
This commit is contained in:
Simon L'nu 2012-05-24 05:28:40 -04:00
parent f0ddcb979b
commit 3c15336984

Diff Content Not Available