From: Erich Smith <heartquest@gmail.com>
Date: Fri, 11 May 2012 18:08:33 +0000 (-0400)
Subject: Merge branch 'master' into plugin_metadata
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=205027491a37f7d8cc986e988b8a852a15404f2a;p=common%2Fbash_it.git

Merge branch 'master' into plugin_metadata
---

205027491a37f7d8cc986e988b8a852a15404f2a