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

[Vincent Batts]

commit a062a7b1003b2208e206b7ab090bdef534338a4c
Merge: 33f3ad0 c3818f2
Author: Vincent Batts <vbatts at redhat.com>
Date:   Tue Aug 12 15:26:31 2014 +0000

    Merge branch 'master' into f21
    
    Conflicts:
    	golang-googlecode-tools.spec

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