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

[tdawson]

commit 0e7688b985984aa3dd06a9554419a203e630df76
Merge: f3aca01 1a5208f
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Dec 19 14:48:02 2012 -0600

    Merge branch 'master' into f18

 .gitignore                       |    1 +
 openshift-origin-port-proxy.spec |   13 ++++++++-----
 sources                          |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 2b4e8d3,bad215b..dddb6b8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/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