[golang-googlecode-tools/el6: 5/7] Merge branch 'master' into f21

[Vincent Batts]

commit 33f3ad090b2b375959deef82ff84cce706954cdb
Merge: adae238 d3da4a8
Author: Vincent Batts <vbatts at redhat.com>
Date:   Tue Aug 12 15:24:56 2014 +0000

    Merge branch 'master' into f21

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