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

[Adam Miller]

commit bb2aeae6adbba753736a1351a5548af7fd90a0fa
Merge: b9ac06a 40f74d4
Author: Adam Miller <admiller at redhat.com>
Date:   Wed Feb 19 10:43:29 2014 -0600

    Merge branch 'master' into epel7
    
    * master:
      replace f21+ hostname patch that fedpkg import deleted

 golang-f21-hostname.patch |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
---