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

[Adam Miller]

commit 8b15f6569a819d9f3d6e0dfd33dc353e3f4762fa
Merge: 3fb2038 01d4c2e
Author: Adam Miller <admiller at redhat.com>
Date:   Tue Mar 4 10:35:40 2014 -0600

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

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