[golang/epel7: 2/4] Merge branch 'master' into epel7

[Vincent Batts]

commit 8e03a6571dda6de5464d86d79d1e59892bfa0f1a
Merge: 627516c 94c0b3b
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Oct 1 15:15:17 2014 +0000

    Merge branch 'master' into epel7

 .gitignore                  |    1 +
 golang.spec                 |   11 ++++-------
 skip_syndey_time_test.patch |   13 -------------
 sources                     |    2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)
---