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

[Vincent Batts]

commit f6b00dfb0a9e3b62bcb4f10fdd76abdae89494f9
Merge: 6619ba3 1256258
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Aug 20 13:17:50 2014 +0000

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

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