[openshift-origin-port-proxy/f18: 3/3] merging

[tdawson]

commit f3aca01ff86809b24a8f12042ff5d006a7149767
Merge: 26d94f0 1ab804e
Author: Troy Dawson <tdawson at redhat.com>
Date:   Thu Nov 29 17:00:09 2012 -0600

    merging

 .gitignore                       |    2 +-
 openshift-origin-port-proxy.spec |  172 ++++++++++++++++++++++++++------------
 sources                          |    2 +-
 3 files changed, 120 insertions(+), 56 deletions(-)
---
diff --cc .gitignore
index c55bb2b,4051778..2b4e8d3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/openshift-origin-port-proxy-0.3.3.tar.gz
+ /openshift-origin-port-proxy-1.1.1.tar.gz