[golang-googlecode-tools/f19: 2/2] Merge branch 'master' into f19

[Vincent Batts]

commit 9d698c1a380fbb5d29edc1c541f46ebbf8e75e14
Merge: 5731200 204df4e
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Aug 20 18:00:09 2014 +0000

    Merge branch 'master' into f19

 .gitignore                   |    1 +
 golang-googlecode-tools.spec |  164 +++++++++++++++++++++++++++++++++++++-----
 sources                      |    2 +-
 3 files changed, 147 insertions(+), 20 deletions(-)
---