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

[Lokesh Mandvekar]

commit 6cc47fd49e9223e1fc18b9f138ecd16dd40173dd
Merge: 453651b 30f3d48
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed Oct 16 23:29:55 2013 -0500

    Merge branch 'master' into f20

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