[openshift-origin-port-proxy/f18: 2/2] Merge branch 'master' into f18

[tdawson]

commit f14f6ba326a681be7efa0e6844d31f305cb07f41
Merge: 0e7688b de92aef
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 14:15:32 2013 -0600

    Merge branch 'master' into f18

 .gitignore                       |    1 +
 openshift-origin-port-proxy.spec |    6 ++++--
 sources                          |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index dddb6b8,e97756a..de7875d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -/openshift-origin-port-proxy-0.3.3.tar.gz
  /openshift-origin-port-proxy-1.1.1.tar.gz
  /openshift-origin-port-proxy-1.1.3.tar.gz
+ /openshift-origin-port-proxy-1.2.1.tar.gz