[rubygem-openshift-origin-msg-broker-mcollective/f17: 5/5] merging

[tdawson]

commit a8e28ec0f1d90949931a4643cf9e821f92bc494d
Merge: 8069283 c3ad635
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu Nov 29 17:17:14 2012 -0600

    merging

 .gitignore                                         |    2 +-
 ...em-openshift-origin-msg-broker-mcollective.spec |   33 ++++++-------------
 sources                                            |    2 +-
 3 files changed, 13 insertions(+), 24 deletions(-)
---
diff --cc .gitignore
index d38bcef,4861a2e..46c2a4d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/openshift-origin-msg-broker-mcollective-0.1.1.gem
+ /openshift-origin-msg-broker-mcollective-1.0.1.gem