[mcollective-qpid-plugin/f18: 3/3] merge

[tdawson]

commit 0a65bce506f78e5039a5731ed97e5be0bd2f262c
Merge: 412b4c7 ec1bbc4
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu Nov 29 17:39:51 2012 -0600

    merge

 .gitignore                   |    2 +-
 mcollective-qpid-plugin.spec |    7 +++++--
 sources                      |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index a803c25,778dafa..7d1c8fe
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/mcollective-qpid-plugin-0.1.1.tar.gz
+ /mcollective-qpid-plugin-1.0.1.tar.gz