[golang/el6: 4/4] Merge branch 'f20' into el6

[Vincent Batts]

commit 2986c3304eaccd2c28f58b7fc659aeff94227cf0
Merge: 8b9f2ff 9de436f
Author: Vincent Batts <vbatts at redhat.com>
Date:   Wed Oct 1 15:58:28 2014 +0000

    Merge branch 'f20' into el6

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