[golang-github-kr-pty/f19: 2/2] Merge branch 'master' into f19

[Lokesh Mandvekar]

commit 052588398a1a28efc13e3386f05a28d1a88e34f0
Merge: 424e8f0 30f3d48
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed Oct 16 23:41:22 2013 -0500

    Merge branch 'master' into f19

 golang-github-kr-pty.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---