[mcollective-qpid-plugin/f18: 2/2] Merge branch 'master' into f18

[tdawson]

commit 2766f3fc6129fb75b3c921c5c04878689541daf3
Merge: 73bb423 2bea3e9
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Dec 19 11:37:18 2012 -0600

    Merge branch 'master' into f18

 .gitignore                   |    1 +
 mcollective-qpid-plugin.spec |   14 +++++++++++---
 sources                      |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 04e7d44,6d1439f..a0a2b40
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -/mcollective-qpid-plugin-0.1.1.tar.gz
  /mcollective-qpid-plugin-1.0.1.tar.gz
  /mcollective-qpid-plugin-1.1.1.tar.gz
+ /mcollective-qpid-plugin-1.1.2.tar.gz