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

[Adam Miller]

commit 5253fbfde833562e75dc82726bfccbe0983c721b
Merge: ea4af86 40f74d4
Author: Adam Miller 
Date:   Wed Feb 19 10:43:11 2014 -0600

Merge branch 'master' into f20

* master:
      replace f21+ hostname patch that fedpkg import deleted

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