[golang/f20: 2/2] Merge branch 'master' into f20

[Adam Miller]

commit 3342a8bbe57d6ab4c06db15b6f0a76e297943b28
Merge: 8a8b586 01d4c2e
Author: Adam Miller <admiller(a)redhat.com&gt;
Date:   Tue Mar 4 10:27:29 2014 -0600

    Merge branch 'master' into f20
    
    * master:
      update to latest upstream 1.2.1

 .gitignore  |    1 +
 golang.spec |    7 +++++--
 sources     |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---