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

[Vincent Batts]

commit 5731200251f1e46b6b7181411eef7a2526f4c5de
Merge: a062a7b 1256258
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Aug 20 13:18:11 2014 +0000

    Merge branch 'master' into f19

 golang-googlecode-tools.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---