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

[Lokesh Mandvekar]

commit ae256917824914a7744f6b9d0f8b8ebd01ce41cb
Merge: 0548508 7fdc969
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Sun Oct 6 15:01:49 2013 -0500

    Merge branch 'master' into f20

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