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

[Vincent Batts]

commit 668c87d6d89cf60486fb0c934fcb47ae13e9f156
Merge: cf91978 6109664
Author: Vincent Batts <vbatts at redhat.com>
Date:   Tue May 20 13:14:13 2014 -0400

    Merge branch 'master' into f20

 golang.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---