From 5d6296b81b43655d41320f99dde5ef6c9f1382f8 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 1 May 2012 04:02:17 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  hidden plugins (add .hidden file to dir)

* master: